Merge "debuggerd: add the PAC keys to the tombstones." am: 9453199683 (16ad439b) · Commits · e / os / android_system_core

debuggerd/crash_dump.cpp

+11 −2

Original line number	Original line	Diff line number	Diff line
	@@ -502,15 +502,24 @@ int main(int argc, char** argv) {
	continue;		continue;
	}		}

	struct iovec iov = {		struct iovec tagged_addr_iov = {
	&info.tagged_addr_ctrl,		&info.tagged_addr_ctrl,
	sizeof(info.tagged_addr_ctrl),		sizeof(info.tagged_addr_ctrl),
	};		};
	if (ptrace(PTRACE_GETREGSET, thread, NT_ARM_TAGGED_ADDR_CTRL,		if (ptrace(PTRACE_GETREGSET, thread, NT_ARM_TAGGED_ADDR_CTRL,
	reinterpret_cast<void*>(&iov)) == -1) {		reinterpret_cast<void*>(&tagged_addr_iov)) == -1) {
	info.tagged_addr_ctrl = -1;		info.tagged_addr_ctrl = -1;
	}		}

			struct iovec pac_enabled_keys_iov = {
			&info.pac_enabled_keys,
			sizeof(info.pac_enabled_keys),
			};
			if (ptrace(PTRACE_GETREGSET, thread, NT_ARM_PAC_ENABLED_KEYS,
			reinterpret_cast<void*>(&pac_enabled_keys_iov)) == -1) {
			info.pac_enabled_keys = -1;
			}

	if (thread == g_target_thread) {		if (thread == g_target_thread) {
	// Read the thread's registers along with the rest of the crash info out of the pipe.		// Read the thread's registers along with the rest of the crash info out of the pipe.
	ReadCrashInfo(input_pipe, &siginfo, &info.registers, &process_info);		ReadCrashInfo(input_pipe, &siginfo, &info.registers, &process_info);

debuggerd/debuggerd_test.cpp

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -173,6 +173,14 @@ static void tombstoned_intercept(pid_t target_pid, unique_fd* intercept_fd, uniq
	*status = response.status;		*status = response.status;
	}		}

			static bool pac_supported() {
			#if defined(__aarch64__)
			return getauxval(AT_HWCAP) & HWCAP_PACA;
			#else
			return false;
			#endif
			}

	class CrasherTest : public ::testing::Test {		class CrasherTest : public ::testing::Test {
	public:		public:
	pid_t crasher_pid = -1;		pid_t crasher_pid = -1;
	@@ -357,6 +365,12 @@ TEST_F(CrasherTest, smoke) {
	ASSERT_MATCH(result, R"(tagged_addr_ctrl: 000000000007fff3)"		ASSERT_MATCH(result, R"(tagged_addr_ctrl: 000000000007fff3)"
	R"( \(PR_TAGGED_ADDR_ENABLE, PR_MTE_TCF_SYNC, mask 0xfffe\))");		R"( \(PR_TAGGED_ADDR_ENABLE, PR_MTE_TCF_SYNC, mask 0xfffe\))");
	}		}

			if (pac_supported()) {
			// Test that the default PAC_ENABLED_KEYS value is set.
			ASSERT_MATCH(result, R"(pac_enabled_keys: 000000000000000f)"
			R"( \(PR_PAC_APIAKEY, PR_PAC_APIBKEY, PR_PAC_APDAKEY, PR_PAC_APDBKEY\))");
			}
	}		}

	TEST_F(CrasherTest, tagged_fault_addr) {		TEST_F(CrasherTest, tagged_fault_addr) {

debuggerd/libdebuggerd/include/libdebuggerd/types.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,7 @@
	struct ThreadInfo {		struct ThreadInfo {
	std::unique_ptr<unwindstack::Regs> registers;		std::unique_ptr<unwindstack::Regs> registers;
	long tagged_addr_ctrl = -1;		long tagged_addr_ctrl = -1;
			long pac_enabled_keys = -1;

	pid_t uid;		pid_t uid;

debuggerd/libdebuggerd/include/libdebuggerd/utility.h

+18 −21

Original line number	Original line	Diff line number	Diff line
	/* system/debuggerd/utility.h		/*
	**		* Copyright 2008, The Android Open Source Project
	** Copyright 2008, The Android Open Source Project		*
	**		* Licensed under the Apache License, Version 2.0 (the "License");
	** Licensed under the Apache License, Version 2.0 (the "License");		* you may not use this file except in compliance with the License.
	** you may not use this file except in compliance with the License.		* You may obtain a copy of the License at
	** You may obtain a copy of the License at		*
	**		* http://www.apache.org/licenses/LICENSE-2.0
	** http://www.apache.org/licenses/LICENSE-2.0		*
	**		* Unless required by applicable law or agreed to in writing, software
	** Unless required by applicable law or agreed to in writing, software		* distributed under the License is distributed on an "AS IS" BASIS,
	** distributed under the License is distributed on an "AS IS" BASIS,		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.		* See the License for the specific language governing permissions and
	** See the License for the specific language governing permissions and		* limitations under the License.
	** limitations under the License.
	*/		*/

	#ifndef _DEBUGGERD_UTILITY_H		#pragma once
	#define _DEBUGGERD_UTILITY_H

	#include <inttypes.h>		#include <inttypes.h>
	#include <signal.h>		#include <signal.h>
	@@ -93,6 +91,7 @@ void get_signal_sender(char* buf, size_t n, const siginfo_t*);
	const char* get_signame(const siginfo_t*);		const char* get_signame(const siginfo_t*);
	const char* get_sigcode(const siginfo_t*);		const char* get_sigcode(const siginfo_t*);
	std::string describe_tagged_addr_ctrl(long ctrl);		std::string describe_tagged_addr_ctrl(long ctrl);
			std::string describe_pac_enabled_keys(long keys);

	// Number of bytes per MTE granule.		// Number of bytes per MTE granule.
	constexpr size_t kTagGranuleSize = 16;		constexpr size_t kTagGranuleSize = 16;
	@@ -100,5 +99,3 @@ constexpr size_t kTagGranuleSize = 16;
	// Number of rows and columns to display in an MTE tag dump.		// Number of rows and columns to display in an MTE tag dump.
	constexpr size_t kNumTagColumns = 16;		constexpr size_t kNumTagColumns = 16;
	constexpr size_t kNumTagRows = 16;		constexpr size_t kNumTagRows = 16;

	#endif // _DEBUGGERD_UTILITY_H

debuggerd/libdebuggerd/test/utility_test.cpp

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -31,3 +31,12 @@ TEST(UtilityTest, describe_tagged_addr_ctrl) {
	describe_tagged_addr_ctrl(0xf0000000 \| PR_TAGGED_ADDR_ENABLE \| PR_MTE_TCF_SYNC \|		describe_tagged_addr_ctrl(0xf0000000 \| PR_TAGGED_ADDR_ENABLE \| PR_MTE_TCF_SYNC \|
	PR_MTE_TCF_ASYNC \| (0xfffe << PR_MTE_TAG_SHIFT)));		PR_MTE_TCF_ASYNC \| (0xfffe << PR_MTE_TAG_SHIFT)));
	}		}

			TEST(UtilityTest, describe_pac_enabled_keys) {
			EXPECT_EQ("", describe_pac_enabled_keys(0));
			EXPECT_EQ(" (PR_PAC_APIAKEY)", describe_pac_enabled_keys(PR_PAC_APIAKEY));
			EXPECT_EQ(" (PR_PAC_APIAKEY, PR_PAC_APDBKEY)",
			describe_pac_enabled_keys(PR_PAC_APIAKEY \| PR_PAC_APDBKEY));
			EXPECT_EQ(" (PR_PAC_APIAKEY, PR_PAC_APDBKEY, unknown 0x1000)",
			describe_pac_enabled_keys(PR_PAC_APIAKEY \| PR_PAC_APDBKEY \| 0x1000));
			}