commit fd92d07d173f075771ce533a2b90c833238eca47
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 27 06:51:52 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 27 06:51:52 2017 +0000
tree b1e051454eed8af433cf6785be0e659b8175e6b3
parent 84cd11f1245efba88ad96e110c0e058d84489407
parent d0f96d7af283e83cd1d84f16a3898109214b23d9

Merge "init: fix type of 2nd argument passed to prctl"

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;