ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Teach debuggerd about SIGSYS SYS_SECCOMP signals."

Browse source 
am: 44d7a87621

Change-Id: Ic5a523fd4f337c0e0d10b8736181c10a3daf4b7d
This commit is contained in:
Elliott Hughes 2016-09-07 22:30:50 +00:00 • committed by android-build-merger
commit 9bec09f3cd
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
debuggerd/client/debuggerd_client.cpp
View file

@ -129,6 +129,9 @@ static void log_signal_summary(int signum, const siginfo_t* info) {
signal_name = "SIGSTKFLT"; signal_name = "SIGSTKFLT";
break; break;
#endif #endif
case SIGSYS:
signal_name = "SIGSYS";
break;
case SIGTRAP: case SIGTRAP:
signal_name = "SIGTRAP"; signal_name = "SIGTRAP";
break; break;

9
debuggerd/tombstone.cpp
View file

@ -85,6 +85,7 @@ static const char* get_signame(int sig) {
case SIGSTKFLT: return "SIGSTKFLT"; case SIGSTKFLT: return "SIGSTKFLT";
#endif #endif
case SIGSTOP: return "SIGSTOP"; case SIGSTOP: return "SIGSTOP";
case SIGSYS: return "SIGSYS";
case SIGTRAP: return "SIGTRAP"; case SIGTRAP: return "SIGTRAP";
default: return "?"; default: return "?";
} }
@ -148,6 +149,14 @@ static const char* get_sigcode(int signo, int code) {
static_assert(NSIGSEGV == SEGV_ACCERR, "missing SEGV_* si_code"); static_assert(NSIGSEGV == SEGV_ACCERR, "missing SEGV_* si_code");
#endif #endif
break; break;
#if defined(SYS_SECCOMP) // Our glibc is too old, and we build this for the host too.
case SIGSYS:
switch (code) {
case SYS_SECCOMP: return "SYS_SECCOMP";
}
static_assert(NSIGSYS == SYS_SECCOMP, "missing SYS_* si_code");
break;
#endif
case SIGTRAP: case SIGTRAP:
switch (code) { switch (code) {
case TRAP_BRKPT: return "TRAP_BRKPT"; case TRAP_BRKPT: return "TRAP_BRKPT";