From nobody Mon Jun 2 10:42:01 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9r4n5lFVz5xsDB; Mon, 02 Jun 2025 10:42:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9r4n2VrVz3gbk; Mon, 02 Jun 2025 10:42:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748860921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NNZVG0Bj7jp9eAKTU/SUZko6piaxsE2H9fHd99ddPd8=; b=xFZHQM93hmkxbsV2en/TUMSj9HI9424ooGc0G8gTXkOyEDRJ2aNrJxxJh3QRkPtA3eDClU OHaTmFYQtoJBmzmoQigP0FLj5tWI75Hk8jf89LBvtEuASQLXp0aNeIIVt6BP/8AOTUjIFP YUJWr9Ai4BjVvY52Bh4gUfXZY6x3JtcnHfvYW9VcoSAGVw/sBjYImqBI2lKZCYE9Ze5MhV HlsnQVJnu482toU7t886W3iejPtzqwy1R2n/8xBXBaL11BE+yYY9xm58mGxiXuRzaQTvTl K1MnyUbtfaqbCag50juxkaKN3Na/1iwza3vY6TpNFD26V+xjW/gDGfZtI/HYhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748860921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NNZVG0Bj7jp9eAKTU/SUZko6piaxsE2H9fHd99ddPd8=; b=aa1kbenccjHDgw4RmmQSRfc9Ic3JOW70/SOjwDFeywVAEMHHqiHVuHMculsNl9ijoLDw6G hVUgz1oYznEOUIkKYqSdfgwQpqokZrG8Rpw3v/zyEu6nSfYS5EEVeZBoLL6Mby4Eb7kLMW DjN+Rw++UfkfcCeq6Xw7sKTgBvgqk9nQXenCYARcKxuOlEVA7X1jKBwVFtqyit+pUxwXqZ nRNkp3T40TwSi2IvM9yY8/rYpljBR7wMAblLT+Ih3RPK3CaA3wzpQNau5TGXSlF3PUx4uX fMdgatIvgxrQXnfCfAVGO8Udhmtq6zi+wkxIT03jW0IZa2w2fGXU9dgLO5yU7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748860921; a=rsa-sha256; cv=none; b=nDYvYzjJRhgeghbRpytSf4VeHoEmodElKEQ2MBARe+9A5NfUqH+Hm2rWc7AqzNdMMe4HXS A4tXXP77GCKq4IPP4c2iWNqgTKPAApeCE6AvRRyaXvJfb1Kg6mKnDAsLbuibbsjTWnOSMY MlZftq6brOhB7idPOoBLBRmgKn8+gsaRRmguKpLcxlcEawY1BRu/k2KKJ+lXghehvsCsBy lQmdbg659R8lvFpuQSxm5M43kkk9+pUnGhUjiUGQHD7uK81TNw/Ed4n/YoS7ZKbsI1rvjZ wbl3CnZbKjuGSZ7xTQfuwzK6mWxarA59ICWFu246fwbJ+dmU+SIeUAS/K+GcmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9r4n25zPz151t; Mon, 02 Jun 2025 10:42:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 552Ag1NM012414; Mon, 2 Jun 2025 10:42:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 552Ag1Og012412; Mon, 2 Jun 2025 10:42:01 GMT (envelope-from git) Date: Mon, 2 Jun 2025 10:42:01 GMT Message-Id: <202506021042.552Ag1Og012412@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 89bb17ec3b02 - main - arm64: Mask out the PAC ID fields when disabled List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89bb17ec3b0260fa0d9c30a23b7e5f73fc5917f4 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=89bb17ec3b0260fa0d9c30a23b7e5f73fc5917f4 commit 89bb17ec3b0260fa0d9c30a23b7e5f73fc5917f4 Author: Andrew Turner AuthorDate: 2025-06-02 09:57:44 +0000 Commit: Andrew Turner CommitDate: 2025-06-02 09:57:44 +0000 arm64: Mask out the PAC ID fields when disabled When we disable PAC we need to mask out the ID registers for userspace. Call update_special_reg to mask them out so userspace gets a correct view of the registers and hwcaps. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50573 --- sys/arm64/arm64/ptrauth.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/ptrauth.c b/sys/arm64/arm64/ptrauth.c index 7ef958b2e03c..dd36e66c85bb 100644 --- a/sys/arm64/arm64/ptrauth.c +++ b/sys/arm64/arm64/ptrauth.c @@ -97,14 +97,14 @@ ptrauth_check(const struct cpu_feat *feat __unused, u_int midr __unused) 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 @@ ptrauth_check(const struct cpu_feat *feat __unused, u_int midr __unused) */ 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