diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-05-02 20:27:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-02 20:27:55 +0000 |
| commit | c2023015098facc9e4c99ac25b085a8d1686dd8f (patch) | |
| tree | 93e9e749c2ebd264d7cdfacadace4fc173337283 | |
| parent | 78d1aad1d561ec58f668f347602ba2aeb3036499 (diff) | |
| parent | 2350db4bee8dd1062a12fde5fa8f1b624b4fe5c0 (diff) | |
| download | core-build-tools-release.tar.gz | |
Merge "Snap for 11794311 from 966cc3dc0e8bafefada0bb6edc920d2c691789fb to build-tools-release" into build-tools-releasebuild-tools-release
| -rw-r--r-- | debuggerd/debuggerd_test.cpp | 3 | ||||
| -rw-r--r-- | debuggerd/libdebuggerd/tombstone.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/debuggerd/debuggerd_test.cpp b/debuggerd/debuggerd_test.cpp index 7c52e6e50..e4e2f99cc 100644 --- a/debuggerd/debuggerd_test.cpp +++ b/debuggerd/debuggerd_test.cpp @@ -1667,6 +1667,9 @@ TEST_F(CrasherTest, seccomp_tombstone_thread_abort) { std::string result; ConsumeFd(std::move(output_fd), &result); + ASSERT_MATCH( + result, + R"(signal 6 \(SIGABRT\))"); ASSERT_BACKTRACE_FRAME(result, "abort"); } diff --git a/debuggerd/libdebuggerd/tombstone.cpp b/debuggerd/libdebuggerd/tombstone.cpp index 375ed8a2c..5a416d643 100644 --- a/debuggerd/libdebuggerd/tombstone.cpp +++ b/debuggerd/libdebuggerd/tombstone.cpp @@ -76,7 +76,7 @@ void engrave_tombstone_ucontext(int tombstone_fd, int proto_fd, uint64_t abort_m threads[target_tid] = ThreadInfo { .registers = std::move(regs), .uid = uid, .tid = target_tid, .thread_name = std::move(thread_name), .pid = pid, .command_line = std::move(command_line), - .selinux_label = std::move(selinux_label), .siginfo = siginfo, + .selinux_label = std::move(selinux_label), .siginfo = siginfo, .signo = siginfo->si_signo, // Only supported on aarch64 for now. #if defined(__aarch64__) .tagged_addr_ctrl = prctl(PR_GET_TAGGED_ADDR_CTRL, 0, 0, 0, 0), |