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

Merge "debuggerd_handler: don't assume that abort message implies fatal."

Browse source
This commit is contained in:
Treehugger Robot 2017-04-28 02:47:16 +00:00 • committed by Gerrit Code Review
commit 263e1e9509
2 changed files with 38 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
debuggerd/debuggerd_test.cpp
View file

@ -78,6 +78,14 @@ constexpr char kWaitForGdbKey[] = "debug.debuggerd.wait_for_gdb";
} \ } \
} while (0) } while (0)
#define ASSERT_NOT_MATCH(str, pattern) \
do { \
std::regex r((pattern)); \
if (std::regex_search((str), r)) { \
FAIL() << "regex mismatch: expected to not find " << (pattern) << " in: \n" << (str); \
} \
} while (0)
static void tombstoned_intercept(pid_t target_pid, unique_fd* intercept_fd, unique_fd* output_fd) { static void tombstoned_intercept(pid_t target_pid, unique_fd* intercept_fd, unique_fd* output_fd) {
intercept_fd->reset(socket_local_client(kTombstonedInterceptSocketName, intercept_fd->reset(socket_local_client(kTombstonedInterceptSocketName,
ANDROID_SOCKET_NAMESPACE_RESERVED, SOCK_SEQPACKET)); ANDROID_SOCKET_NAMESPACE_RESERVED, SOCK_SEQPACKET));
@ -226,12 +234,14 @@ void CrasherTest::AssertDeath(int signo) {
FAIL() << "failed to wait for crasher: " << strerror(errno); FAIL() << "failed to wait for crasher: " << strerror(errno);
} }
if (WIFEXITED(status)) { if (signo == 0) {
FAIL() << "crasher failed to exec: " << strerror(WEXITSTATUS(status)); ASSERT_TRUE(WIFEXITED(status));
} else if (!WIFSIGNALED(status)) { ASSERT_EQ(0, WEXITSTATUS(signo));
FAIL() << "crasher didn't terminate via a signal"; } else {
ASSERT_FALSE(WIFEXITED(status));
ASSERT_TRUE(WIFSIGNALED(status)) << "crasher didn't terminate via a signal";
ASSERT_EQ(signo, WTERMSIG(status));
} }
ASSERT_EQ(signo, WTERMSIG(status));
crasher_pid = -1; crasher_pid = -1;
} }
@ -336,6 +346,26 @@ TEST_F(CrasherTest, abort_message) {
ASSERT_MATCH(result, R"(Abort message: 'abort message goes here')"); ASSERT_MATCH(result, R"(Abort message: 'abort message goes here')");
} }
TEST_F(CrasherTest, abort_message_backtrace) {
int intercept_result;
unique_fd output_fd;
StartProcess([]() {
android_set_abort_message("not actually aborting");
raise(DEBUGGER_SIGNAL);
exit(0);
});
StartIntercept(&output_fd);
FinishCrasher();
AssertDeath(0);
FinishIntercept(&intercept_result);
ASSERT_EQ(1, intercept_result) << "tombstoned reported failure";
std::string result;
ConsumeFd(std::move(output_fd), &result);
ASSERT_NOT_MATCH(result, R"(Abort message:)");
}
TEST_F(CrasherTest, intercept_timeout) { TEST_F(CrasherTest, intercept_timeout) {
int intercept_result; int intercept_result;
unique_fd output_fd; unique_fd output_fd;

5
debuggerd/handler/debuggerd_handler.cpp
View file

@ -389,8 +389,9 @@ static void debuggerd_signal_handler(int signal_number, siginfo_t* info, void* c
log_signal_summary(signal_number, info); log_signal_summary(signal_number, info);
// Populate si_value with the abort message address, if found. // If this was a fatal crash, populate si_value with the abort message address if possible.
if (abort_message) { // Note that applications can set an abort message without aborting.
if (abort_message && signal_number != DEBUGGER_SIGNAL) {
info->si_value.sival_ptr = abort_message; info->si_value.sival_ptr = abort_message;
} }