commit a72436067d5f88885e4b32fa7c5d22f1ea8c0756
author Ben Fennema <fennema@google.com> Tue Jul 25 14:37:21 2017 -0700
committer Tom Cherry <tomcherry@google.com> Thu Jul 27 03:31:18 2017 +0000
tree b1e051454eed8af433cf6785be0e659b8175e6b3
parent a19f481c8caa8f1e7579fffa3c382d5181d982fa

init: fix type of 2nd argument passed to prctl

prctl(PR_SET_SECUREBITS, ...) expects an unsigned long as its 2nd argument.
Passing in a int64_t happens to work with a 64-bit kernel, but does not
work with a 32-bit kernel.

Bug: 63680332
Test: boot 32-bit kernel; verify services with capabilities can successfully
      set those capabilties
Change-Id: I60250d107a77b54b2e9fe3419b4480b921c7e2f8
Signed-off-by: Ben Fennema <fennema@google.com>

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index fc64db6..e800d32 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -225,8 +225,8 @@
     if (capabilities_.any() && uid_) {
         // If Android is running in a container, some securebits might already
         // be locked, so don't change those.
-        int64_t securebits = prctl(PR_GET_SECUREBITS);
-        if (securebits == -1) {
+        unsigned long securebits = prctl(PR_GET_SECUREBITS);
+        if (securebits == -1UL) {
             PLOG(FATAL) << "prctl(PR_GET_SECUREBITS) failed for " << name_;
         }
         securebits |= SECBIT_KEEP_CAPS | SECBIT_KEEP_CAPS_LOCKED;