Merge "Get the program name for MTE property check." into main (a161b0ee) · Commits · e / os / android_system_core

debuggerd/debuggerd_test.cpp

+37 −0

Original line number	Diff line number	Diff line
		@@ -1841,6 +1841,43 @@ TEST_F(CrasherTest, seccomp_backtrace_no_allocation) {
		ASSERT_BACKTRACE_FRAME(result, "bar");
		}

		TEST_F(CrasherTest, seccomp_mte) {
		#if defined(__aarch64__)
		if (!mte_supported() \|\| !mte_enabled()) {
		GTEST_SKIP() << "Requires MTE";
		}

		LogcatCollector logcat_collector;

		size_t allocation_size = 1;
		int intercept_result;
		unique_fd output_fd;
		StartProcess(
		[&]() {
		SetTagCheckingLevelSync();
		volatile int* p = (volatile int*)malloc(allocation_size);
		free((void*)p);
		p[0] = 42;
		},
		&seccomp_fork);

		StartIntercept(&output_fd);
		FinishCrasher();
		AssertDeath(SIGSEGV);
		FinishIntercept(&intercept_result);

		ASSERT_EQ(1, intercept_result) << "tombstoned reported failure";

		// The fallback path does not support getting MTE error data, so simply check
		// that we get the correct type of crash.
		std::string result;
		ConsumeFd(std::move(output_fd), &result);
		ASSERT_MATCH(result, R"(signal 11 \(SIGSEGV\), code 9 \(SEGV_MTESERR)");
		#else
		GTEST_SKIP() << "Requires aarch64";
		#endif
		}

		TEST_F(CrasherTest, competing_tracer) {
		int intercept_result;
		unique_fd output_fd;

+2 −1

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@
		#include <time.h>
		#include <unistd.h>

		#include <android-base/file.h>
		#include <android-base/macros.h>
		#include <android-base/parsebool.h>
		#include <android-base/parseint.h>
		@@ -108,7 +109,7 @@ static bool is_permissive_mte() {
		char process_sysprop_name[512];
		async_safe_format_buffer(process_sysprop_name, sizeof(process_sysprop_name),
		"persist.device_config.memory_safety_native.permissive.process.%s",
		getprogname());
		android::base::Basename(android::base::GetExecutablePath()).c_str());
		// DO NOT REPLACE this with GetBoolProperty. That uses std::string which allocates, so it is
		// not async-safe, and this function gets used in a signal handler.
		return property_parse_bool("persist.sys.mte.permissive") \|\|

+1 −0

+1 −0

+5 −0