openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge changes I29c45a8b,I807439d8 am: 892b158af8 am: 18ac6293a5 

am: 33f684e1be

Change-Id: Iaacf8d11203869586cc6b2f3afebc9378630223c
This commit is contained in:
Josh Gao 2017-02-17 08:38:30 +00:00 committed by android-build-merger
parent 374ef9d1c4 33f684e1be
commit ba97f47964
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
debuggerd/crash_dump.cpp
View File

@ -219,17 +219,6 @@ static void drop_capabilities() {
}
}
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 @@ int main(int argc, char** argv) {
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 @@ int main(int argc, char** argv) {
// 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 @@ int main(int argc, char** argv) {
// 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);

2
debuggerd/handler/debuggerd_handler.cpp
View File

@ -202,7 +202,7 @@ static void raise_caps() {
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));