commit b3adb6939d6fcdeb1605697c9bc273d26df84ae0
author Josh Gao <jmgao@google.com> Tue Feb 07 06:58:41 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 07 06:58:41 2017 +0000
tree 0dbb664cadd3ba4aede485b6a99955f9a7b5e690
parent 37340ec4f0be9957cbd0b9a4f3db2d85cd620897
parent 6408dd5736fcc10d3560ed6c5f6311137001f2bf

Merge "debuggerd_handler: fix prctl return value check." am: 36b8ccb9b2 am: f18d64b2d6 am: dd0aebcb62
am: 48505eef5e

Change-Id: I0a9c4abf57238ce1ee8d2edbe720880fbf8c9319

debuggerd/handler/debuggerd_handler.cpp

diff --git a/debuggerd/handler/debuggerd_handler.cpp b/debuggerd/handler/debuggerd_handler.cpp
index 156534e..38a7be3 100644
--- a/debuggerd/handler/debuggerd_handler.cpp
+++ b/debuggerd/handler/debuggerd_handler.cpp
@@ -218,7 +218,7 @@
     close(pipefds[1]);
 
     // Set all of the ambient capability bits we can, so that crash_dump can ptrace us.
-    for (unsigned long i = 0; prctl(PR_CAPBSET_READ, i, 0, 0, 0); ++i) {
+    for (unsigned long i = 0; prctl(PR_CAPBSET_READ, i, 0, 0, 0) != -1; ++i) {
       prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, i, 0, 0);
     }