15e5ecdcd7
Multiple tests in CtsInitTestCases, e.g. RebootTest#StopServicesSIGKILL, can trigger the following race condition: * A service is started. This involves calling fork() and also to call RunService() in the child process. RunService() calls setpgid(). * Service::Stop() is called and calls KillProcessGroup(). KillProcessGroup() calls kill(-pgid, SIGKILL) before the child process has called setpgid(). pgid is the process ID of the child process. The kill() call fails because setpgid() has not yet been called. Fix this race condition by adding a setpgid() call in the parent process and by waiting from the parent until the child has called setsid() if a console is attached. Bug: 213617178 Test: Cuttlefish + atest 'CtsInitTestCases' Change-Id: I6931cd579e607c247b4f79a5b375455ca3d52e29 Signed-off-by: Bart Van Assche <bvanassche@google.com>
102 lines
2.8 KiB
C++
102 lines
2.8 KiB
C++
/*
|
|
* Copyright (C) 2019 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <sys/resource.h>
|
|
#include <sys/types.h>
|
|
|
|
#include <optional>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include <android-base/unique_fd.h>
|
|
#include <cutils/iosched_policy.h>
|
|
|
|
#include "mount_namespace.h"
|
|
#include "result.h"
|
|
|
|
namespace android {
|
|
namespace init {
|
|
|
|
class Descriptor {
|
|
public:
|
|
Descriptor(const std::string& name, android::base::unique_fd fd)
|
|
: name_(name), fd_(std::move(fd)){};
|
|
|
|
// Publish() unsets FD_CLOEXEC from the FD and publishes its name via setenv(). It should be
|
|
// called when starting a service after fork() and before exec().
|
|
void Publish() const;
|
|
|
|
private:
|
|
std::string name_;
|
|
android::base::unique_fd fd_;
|
|
};
|
|
|
|
struct SocketDescriptor {
|
|
std::string name;
|
|
int type = 0;
|
|
uid_t uid = 0;
|
|
gid_t gid = 0;
|
|
int perm = 0;
|
|
std::string context;
|
|
bool passcred = false;
|
|
bool listen = false;
|
|
bool persist = false;
|
|
|
|
// Create() creates the named unix domain socket in /dev/socket and returns a Descriptor object.
|
|
// It should be called when starting a service, before calling fork(), such that the socket is
|
|
// synchronously created before starting any other services, which may depend on it.
|
|
Result<Descriptor> Create(const std::string& global_context) const;
|
|
};
|
|
|
|
struct FileDescriptor {
|
|
std::string name;
|
|
std::string type;
|
|
|
|
Result<Descriptor> Create() const;
|
|
};
|
|
|
|
struct NamespaceInfo {
|
|
int flags;
|
|
// Pair of namespace type, path to name.
|
|
std::vector<std::pair<int, std::string>> namespaces_to_enter;
|
|
};
|
|
Result<void> EnterNamespaces(const NamespaceInfo& info, const std::string& name,
|
|
std::optional<MountNamespace> override_mount_namespace);
|
|
|
|
struct ProcessAttributes {
|
|
std::string console;
|
|
IoSchedClass ioprio_class;
|
|
int ioprio_pri;
|
|
std::vector<std::pair<int, rlimit>> rlimits;
|
|
uid_t uid;
|
|
gid_t gid;
|
|
std::vector<gid_t> supp_gids;
|
|
int priority;
|
|
bool stdio_to_kmsg;
|
|
};
|
|
|
|
inline bool RequiresConsole(const ProcessAttributes& attr) {
|
|
return !attr.console.empty();
|
|
}
|
|
|
|
Result<void> SetProcessAttributes(const ProcessAttributes& attr);
|
|
|
|
Result<void> WritePidToFiles(std::vector<std::string>* files);
|
|
|
|
} // namespace init
|
|
} // namespace android
|