ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

init: Fix the implementation of the task_profiles keyword

Browse source 
The documentation added by commit c9c0bbac53 ("init: Add task_profiles
init command") mentions that the task_profiles keyword sets process
attributes. Make the implementation of that keyword match the
documentation.

Change-Id: Ia080132f16bfc2488f8c25176d6aed37a2c42780
Signed-off-by: Bart Van Assche <bvanassche@google.com>
This commit is contained in:
Bart Van Assche 2022-10-12 12:25:46 -07:00
parent 4029b05b04
commit 77f3fe5e68
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
init/README.md
View file

@ -368,8 +368,9 @@ runs the service.
given console.
`task_profiles <profile> [ <profile>\* ]`
> Set task profiles for the process when it forks. This is designed to replace the use of
writepid option for moving a process into a cgroup.
> Set task profiles. Before Android U, the profiles are applied to the main thread of the service.
For Android U and later, the profiles are applied to the entire service process. This is designed
to replace the use of writepid option for moving a process into a cgroup.
`timeout_period <seconds>`
> Provide a timeout after which point the service will be killed. The oneshot keyword is respected

14
init/service.cpp
View file

@ -546,8 +546,18 @@ void Service::RunService(const std::vector<Descriptor>& descriptors,
_exit(EXIT_FAILURE);
}
if (task_profiles_.size() > 0 && !SetTaskProfiles(getpid(), task_profiles_)) {
LOG(ERROR) << "failed to set task profiles";
if (task_profiles_.size() > 0) {
bool succeeded = SelinuxGetVendorAndroidVersion() < __ANDROID_API_U__
?
// Compatibility mode: apply the task profiles to the current
// thread.
SetTaskProfiles(getpid(), task_profiles_)
:
// Apply the task profiles to the current process.
SetProcessProfiles(getuid(), getpid(), task_profiles_);
if (!succeeded) {
LOG(ERROR) << "failed to set task profiles";
}
}
// As requested, set our gid, supplemental gids, uid, context, and