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

Merge "init: fix type of 2nd argument passed to prctl" am: 1b506c54c2

Browse source 
am: f01f4e9d4a

Change-Id: Ie84551e47139dbdbbf7a9a27a849718b43e00fa7
This commit is contained in:
Ben Fennema 2017-07-27 07:00:28 +00:00 • committed by android-build-merger
commit ec7afe31a0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
init/service.cpp
View file

@ -225,8 +225,8 @@ void Service::SetProcessAttributes() {
if (capabilities_.any() && uid_) {
// If Android is running in a container, some securebits might already
// be locked, so don't change those.
int64_t securebits = prctl(PR_GET_SECUREBITS);
if (securebits == -1) {
unsigned long securebits = prctl(PR_GET_SECUREBITS);
if (securebits == -1UL) {
PLOG(FATAL) << "prctl(PR_GET_SECUREBITS) failed for " << name_;
}
securebits |= SECBIT_KEEP_CAPS | SECBIT_KEEP_CAPS_LOCKED;