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

Merge "adbd: make a PR_CAPBSET_DROP error fatal."

Browse source 
am: 57134adecb

* commit '57134adecbcbc988922295c466e174c04251b53a':
  adbd: make a PR_CAPBSET_DROP error fatal.
This commit is contained in:
Nick Kralevich 2015-12-16 01:57:14 +00:00 • committed by android-build-merger
commit 85ac05f480
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
adb/daemon/main.cpp
View file

@ -54,11 +54,7 @@ static void drop_capabilities_bounding_set_if_needed() {
}
int err = prctl(PR_CAPBSET_DROP, i, 0, 0, 0);
// Some kernels don't have file capabilities compiled in, and
// prctl(PR_CAPBSET_DROP) returns EINVAL. Don't automatically
// die when we see such misconfigured kernels.
if ((err < 0) && (errno != EINVAL)) {
if (err < 0) {
PLOG(FATAL) << "Could not drop capabilities";
}
}