commit ddd3b227e3b4f4d5293a0fa8d8238500bc73f79e
author Nick Kralevich <nnk@google.com> Wed Dec 16 02:01:33 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 16 02:01:33 2015 +0000
tree 2ddab05a094e48d2c331c11cd332e20e971d6b8c
parent c0fd3b2ab0c90e5f9a8b9f017c9a36573d312929
parent 1b4ffb0ecda9a2b607427cc0fed6a91a4c3960a6

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

* commit '85ac05f4805c3f12a923817ab4939f760ac460ca':
  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";
         }
     }