commit 76b6aa1d9da113faf1ac7f51f63924b65aaf2565
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jul 28 00:47:54 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 28 00:47:54 2017 +0000
tree dcb8740490feae926dcbd5b56a606e341a4d3c45
parent 434783b5fa35fd4375002a2a5cff31d5921153d6
parent ad99328c4a68bf0d81f75455bb41448c46a46e74

Merge changes I60250d10,I08effe32 into oc-mr1-dev

* changes:
  init: fix type of 2nd argument passed to prctl
  init: only use signed-integer-overflow sanitizer

init/Android.bp

diff --git a/init/Android.bp b/init/Android.bp
index 8294598..aaef7e9 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -18,7 +18,7 @@
     name: "init_defaults",
     cpp_std: "experimental",
     sanitize: {
-        misc_undefined: ["integer"],
+        misc_undefined: ["signed-integer-overflow"],
     },
     cppflags: [
         "-DLOG_UEVENTS=0",

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index c0c4905..161256e 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -96,6 +96,6 @@
     ln -sf ../init $(TARGET_ROOT_OUT)/sbin/ueventd; \
     ln -sf ../init $(TARGET_ROOT_OUT)/sbin/watchdogd
 
-LOCAL_SANITIZE := integer
+LOCAL_SANITIZE := signed-integer-overflow
 LOCAL_CLANG := true
 include $(BUILD_EXECUTABLE)

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index 82dd9b1..fe38ee2 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -245,8 +245,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;