D50573.id.diff
No OneTemporary
Actions

Size

816 B

Referenced Files

None

Subscribers

None

D50573.id.diff
View Options

	diff --git a/sys/arm64/arm64/ptrauth.c b/sys/arm64/arm64/ptrauth.c
	--- a/sys/arm64/arm64/ptrauth.c
	+++ b/sys/arm64/arm64/ptrauth.c
	@@ -97,14 +97,14 @@
	if (!pac_enable) {
	if (boothowto & RB_VERBOSE)
	printf("Pointer authentication is disabled\n");
	- return (false);
	+ goto out;
	}

	if (!get_kernel_reg(ID_AA64ISAR1_EL1, &isar1))
	- return (false);
	+ goto out;

	if (ptrauth_disable())
	- return (false);
	+ goto out;

	/*
	* This assumes if there is pointer authentication on the boot CPU
	@@ -113,6 +113,12 @@
	*/
	return (ID_AA64ISAR1_APA_VAL(isar1) > 0 \|\|
	ID_AA64ISAR1_API_VAL(isar1) > 0);
	+
	+out:
	+ update_special_reg(ID_AA64ISAR1_EL1, ID_AA64ISAR1_API_MASK \|
	+ ID_AA64ISAR1_APA_MASK \| ID_AA64ISAR1_GPA_MASK \|
	+ ID_AA64ISAR1_GPI_MASK, 0);
	+ return (false);
	}

	static void