commit 523a20901b2afce7ad02c0011d70ed57f8bbb997
author Nick Kralevich <nnk@google.com> Fri Feb 15 18:07:45 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 15 18:07:46 2013 +0000
tree 7125366666ac9be42503b6159e5bcf68b5a3361c
parent 17361134180b178531979897f9c9867346a57f10
parent 109f4e16cb22e2ae915a4c16d8c8a5e46a749d27

Merge "adb: Use 64 bit capabilities."

adb/adb.c

diff --git a/adb/adb.c b/adb/adb.c
index 92436da..399d43a 100644
--- a/adb/adb.c
+++ b/adb/adb.c
@@ -1238,7 +1238,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);
@@ -1271,12 +1271,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 {