Merge "storaged: handle negative delta in io usage"
diff --git a/adb/shell_service.cpp b/adb/shell_service.cpp
index 4975fab..d4f334b 100644
--- a/adb/shell_service.cpp
+++ b/adb/shell_service.cpp
@@ -320,6 +320,10 @@
parent_error_sfd.reset(-1);
close_on_exec(child_error_sfd);
+ // adbd sets SIGPIPE to SIG_IGN to get EPIPE instead, and Linux propagates that to child
+ // processes, so we need to manually reset back to SIG_DFL here (http://b/35209888).
+ signal(SIGPIPE, SIG_DFL);
+
if (command_.empty()) {
execle(_PATH_BSHELL, _PATH_BSHELL, "-", nullptr, cenv.data());
} else {
diff --git a/debuggerd/crash_dump.cpp b/debuggerd/crash_dump.cpp
index 08b0047..0e15472 100644
--- a/debuggerd/crash_dump.cpp
+++ b/debuggerd/crash_dump.cpp
@@ -219,17 +219,6 @@
}
}
-static void check_process(int proc_fd, pid_t expected_pid) {
- android::procinfo::ProcessInfo proc_info;
- if (!android::procinfo::GetProcessInfoFromProcPidFd(proc_fd, &proc_info)) {
- LOG(FATAL) << "failed to fetch process info";
- }
-
- if (proc_info.pid != expected_pid) {
- LOG(FATAL) << "pid mismatch: expected " << expected_pid << ", actual " << proc_info.pid;
- }
-}
-
int main(int argc, char** argv) {
pid_t target = getppid();
bool tombstoned_connected = false;
@@ -282,6 +271,11 @@
PLOG(FATAL) << "failed to open " << target_proc_path;
}
+ // Make sure our parent didn't die.
+ if (getppid() != target) {
+ PLOG(FATAL) << "parent died";
+ }
+
// Reparent ourselves to init, so that the signal handler can waitpid on the
// original process to avoid leaving a zombie for non-fatal dumps.
pid_t forkpid = fork();
@@ -294,8 +288,6 @@
// Die if we take too long.
alarm(20);
- check_process(target_proc_fd, target);
-
std::string attach_error;
// Seize the main thread.
@@ -337,7 +329,6 @@
// Drop our capabilities now that we've attached to the threads we care about.
drop_capabilities();
- check_process(target_proc_fd, target);
LOG(INFO) << "obtaining output fd from tombstoned";
tombstoned_connected = tombstoned_connect(target, &tombstoned_socket, &output_fd);
diff --git a/debuggerd/crasher/crasher.cpp b/debuggerd/crasher/crasher.cpp
index cd45bbb..1c01e3e 100644
--- a/debuggerd/crasher/crasher.cpp
+++ b/debuggerd/crasher/crasher.cpp
@@ -189,6 +189,7 @@
fprintf(stderr, " fprintf-NULL pass a null pointer to fprintf\n");
fprintf(stderr, " readdir-NULL pass a null pointer to readdir\n");
fprintf(stderr, " strlen-NULL pass a null pointer to strlen\n");
+ fprintf(stderr, " pthread_join-NULL pass a null pointer to pthread_join\n");
fprintf(stderr, "\n");
fprintf(stderr, " no_new_privs set PR_SET_NO_NEW_PRIVS and then abort\n");
fprintf(stderr, "\n");
@@ -258,6 +259,8 @@
readdir_null();
} else if (!strcasecmp(arg, "strlen-NULL")) {
return strlen_null();
+ } else if (!strcasecmp(arg, "pthread_join-NULL")) {
+ return pthread_join(0, nullptr);
} else if (!strcasecmp(arg, "heap-usage")) {
abuse_heap();
} else if (!strcasecmp(arg, "SIGSEGV-unmapped")) {
diff --git a/debuggerd/handler/debuggerd_handler.cpp b/debuggerd/handler/debuggerd_handler.cpp
index 680ba4b..67c26e2 100644
--- a/debuggerd/handler/debuggerd_handler.cpp
+++ b/debuggerd/handler/debuggerd_handler.cpp
@@ -202,7 +202,7 @@
uint64_t capmask = capdata[0].inheritable;
capmask |= static_cast<uint64_t>(capdata[1].inheritable) << 32;
for (unsigned long i = 0; i < 64; ++i) {
- if (capmask & (1 << i)) {
+ if (capmask & (1ULL << i)) {
if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, i, 0, 0) != 0) {
__libc_format_log(ANDROID_LOG_ERROR, "libc", "failed to raise ambient capability %lu: %s",
i, strerror(errno));