commit 1b4ffb0ecda9a2b607427cc0fed6a91a4c3960a6
author Nick Kralevich <nnk@google.com> Wed Dec 16 01:57:14 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 16 01:57:14 2015 +0000
tree cfc68ebf4e1d4a59c4b33244513e2a075117eb1f
parent 200b3fbb10e1ede82f14fddc536759d3a370ff32
parent 22236d8d01ead57923f22aaac174cb7e274188fd

Merge "adbd: make a PR_CAPBSET_DROP error fatal."
am: 57134adecb

* commit '57134adecbcbc988922295c466e174c04251b53a':
  adbd: make a PR_CAPBSET_DROP error fatal.

adb/daemon/main.cpp

diff --git a/adb/daemon/main.cpp b/adb/daemon/main.cpp
index feea7a3..218c1d0 100644
--- a/adb/daemon/main.cpp
+++ b/adb/daemon/main.cpp
@@ -54,11 +54,7 @@
         }
 
         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";
         }
     }