commit b9c087031b4f387fd2d1c6cb9f3ca1d43435c8d4
author Nick Kralevich <nnk@google.com> Fri Feb 15 10:22:08 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 15 10:22:08 2013 -0800
tree 69869044d497eb37a902e84898bbc87c8bc1ae0d
parent 3b7c584fe90a5ea1d14d3e45c4c117d7ce46d39b
parent e149855a816c98149a95725139ae66f193049ddd

am e149855a: am 523a2090: Merge "adb: Use 64 bit capabilities."

* commit 'e149855a816c98149a95725139ae66f193049ddd':
  adb: Use 64 bit capabilities.

adb/adb.c

diff --git a/adb/adb.c b/adb/adb.c
index c57a875..32aff2c 100644
--- a/adb/adb.c
+++ b/adb/adb.c
@@ -1272,7 +1272,7 @@
     /* don't run as root if we are running in secure mode */
     if (should_drop_privileges()) {
         struct __user_cap_header_struct header;
-        struct __user_cap_data_struct cap;
+        struct __user_cap_data_struct cap[2];
 
         if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0) != 0) {
             exit(1);
@@ -1305,12 +1305,15 @@
             exit(1);
         }
 
+        memset(&header, 0, sizeof(header));
+        memset(cap, 0, sizeof(cap));
+
         /* set CAP_SYS_BOOT capability, so "adb reboot" will succeed */
-        header.version = _LINUX_CAPABILITY_VERSION;
+        header.version = _LINUX_CAPABILITY_VERSION_3;
         header.pid = 0;
-        cap.effective = cap.permitted = (1 << CAP_SYS_BOOT);
-        cap.inheritable = 0;
-        capset(&header, &cap);
+        cap[CAP_TO_INDEX(CAP_SYS_BOOT)].effective |= CAP_TO_MASK(CAP_SYS_BOOT);
+        cap[CAP_TO_INDEX(CAP_SYS_BOOT)].permitted |= CAP_TO_MASK(CAP_SYS_BOOT);
+        capset(&header, cap);
 
         D("Local port disabled\n");
     } else {