Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae649331 authored by Peter Collingbourne's avatar Peter Collingbourne Committed by Automerger Merge Worker
Browse files

Merge "Add stack trace coverage to MTE tests." am: 5d97966e am: 3a52bfc3... 

Merge "Add stack trace coverage to MTE tests." am: 5d97966e am: 3a52bfc3 am: 47a85289 am: 9a7db618 am: 608e1949

Change-Id: I39033c6a6534b6ef747a501bbbb725b043031f28
parents eafa8129 608e1949

debuggerd/debuggerd_test.cpp

+14 −3
Original line number Diff line number Diff line
@@ -379,7 +379,12 @@ TEST_F(CrasherTest, mte_uaf) { 
  ConsumeFd(std::move(output_fd), &result);



  ASSERT_MATCH(result, R"(signal 11 \(SIGSEGV\), code 9 \(SEGV_MTESERR\))");

  ASSERT_MATCH(result, R"(Cause: \[MTE\]: Use After Free, 0 bytes into a 16-byte allocation)");

  ASSERT_MATCH(result, R"(Cause: \[MTE\]: Use After Free, 0 bytes into a 16-byte allocation.*



allocated by thread .*

      #00 pc)");

  ASSERT_MATCH(result, R"(deallocated by thread .*

      #00 pc)");

#else

  GTEST_SKIP() << "Requires aarch64 + ANDROID_EXPERIMENTAL_MTE";

#endif
@@ -410,7 +415,10 @@ TEST_F(CrasherTest, mte_overflow) { 
  ConsumeFd(std::move(output_fd), &result);



  ASSERT_MATCH(result, R"(signal 11 \(SIGSEGV\))");

  ASSERT_MATCH(result, R"(Cause: \[MTE\]: Buffer Overflow, 0 bytes right of a 16-byte allocation)");

  ASSERT_MATCH(result, R"(Cause: \[MTE\]: Buffer Overflow, 0 bytes right of a 16-byte allocation.*



allocated by thread .*

      #00 pc)");

#else

  GTEST_SKIP() << "Requires aarch64 + ANDROID_EXPERIMENTAL_MTE";

#endif
@@ -441,7 +449,10 @@ TEST_F(CrasherTest, mte_underflow) { 
  ConsumeFd(std::move(output_fd), &result);



  ASSERT_MATCH(result, R"(signal 11 \(SIGSEGV\), code 9 \(SEGV_MTESERR\))");

  ASSERT_MATCH(result, R"(Cause: \[MTE\]: Buffer Underflow, 4 bytes left of a 16-byte allocation)");

  ASSERT_MATCH(result, R"(Cause: \[MTE\]: Buffer Underflow, 4 bytes left of a 16-byte allocation.*



allocated by thread .*

      #00 pc)");

#else

  GTEST_SKIP() << "Requires aarch64 + ANDROID_EXPERIMENTAL_MTE";

#endif