From nobody Tue Sep 5 05:22:06 2023 X-Original-To: dev-commits-src-all@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 4Rfv5B31yTz4sQ5h; Tue, 5 Sep 2023 05:22:06 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rfv5B2b5Xz3JpV; Tue, 5 Sep 2023 05:22:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693891326; 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=cU0NR8BcHPf2wEeVo7gfxk848VOKw9kT0GiNZxDLXx8=; b=ONQ8c9UicvTmLgUmO0RWbqYM5CBFonp7i0xo3woGlW75HN3XKvDZaml3kscO3KqqtIpnFu nWlx7tn/KalagSHdj3jOx9WzN3doN7kplRUE6aGPJC/c0aVLu5T6IPjVtIcSiVZsvrf6+A NxSVM5lMdi0Gwqu/1ggoHkoOOtt0pDJ2jL+0SkSc+r5QYhOi4Qt4jAnrdKwqiExeHPGobY FPvDGRfXpqedyY9QOKXLtF2RQxaevTSNRnqPARRiqIaUFxXX90a1uSptGZ769diRVTf4EC rKa9kDe+BHcnKm2RTsygstuef1GU8e+1je390zhW7Hx7lnjx3PiXeEWmhX0abA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693891326; a=rsa-sha256; cv=none; b=w7rlvt7YMCSn1+a7KdCBAuhED6rQRP37zu1BwjqvY4P6fbUZbket1r93Jrtqrd0VDrAeM8 d5k3InSktSp2/iBcj9K5DsufwOlCIesu7HsBKLHqGr9zU8KvPH4EoymfBa6CC4pboe8mw0 LliQLOAOeEovqgFVHCZK9E0FUHbem///TzNPKj6/nF/2EHCg/Xln/25VycpAeoD7dKjUY8 UBjyhEuk/kOJUDB6PL3r/sN8CSARV3FWWM0BtX0CYZfLp7VmXqN1igP7g0D4+Y9zH1Xf6U qKFIF7LPpaxQGcThgKMHbuhU3wr9E3FF+KTxz7Fv2MLp5b5OBCLX8Q61g9ISjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693891326; 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=cU0NR8BcHPf2wEeVo7gfxk848VOKw9kT0GiNZxDLXx8=; b=BStZRqw4V1G3qw06rlj0ohm4/u7wsn4OVcvQ1M7XNXpir3cfijhpYRuk/KEqVkXUIXVlj4 EVBIQSPyXCliBuh/3Pxcs3ComCWpxApeuf8DvEQY4hon4ZGh+T1yKk6vyzfz3VVDjdYtFT d40m7BXIm8KBl5mF5UuCacb10eWZIa4XQA5JxwZ/har21D89c895xU7gGWPYhrT8D0FI/o k6GK6REkHMiau8PkhIQGjSgbih0MobTGSmMpnA21EunkvDK8QswxdECEpYsmzoO5wI/ZRg TC7/mf801dKVt7odA2VlRHfX3ap5LOmuRtTMs5dkN2GAVGnmlGUYbc63n/mnxw== 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 4Rfv5B1g4Zz5q5; Tue, 5 Sep 2023 05:22:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3855M6gH081085; Tue, 5 Sep 2023 05:22:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3855M6e3081082; Tue, 5 Sep 2023 05:22:06 GMT (envelope-from git) Date: Tue, 5 Sep 2023 05:22:06 GMT Message-Id: <202309050522.3855M6e3081082@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 8921130e3ada - stable/14 - arm64: initialize pcb in the TBI/PAC/etc. fault case List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8921130e3ada68eca92952045b9b62c869ca1526 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=8921130e3ada68eca92952045b9b62c869ca1526 commit 8921130e3ada68eca92952045b9b62c869ca1526 Author: Kyle Evans AuthorDate: 2023-09-01 02:10:38 +0000 Commit: Kyle Evans CommitDate: 2023-09-05 05:21:25 +0000 arm64: initialize pcb in the TBI/PAC/etc. fault case After 2c10be9e06d, we may jump to the bad_far label without `pcb` being set, resulting in a follow-up fault as we may dereference it immediately after the jump if td_intr_nesting_level == 0. In this branch, it should be safe to dereference `td` as we're not handling the special case mentioned below of accessing it during promotion/demotion. This seems to fix a null ptr deref I hit during my most recent pkgbase build attempt on the Windows DevKit, though that was admittedly encountered while we were on the way to a panic from an apparent use-after-free in ZFS bits. Reviewed by: andrew, markj Approved by: re (delphij) Fixes: 2c10be9e06d ("arm64: Handle translation faults for thread [..]") (cherry picked from commit 03d104888caea595960605a9ff010da7f39133dc) --- sys/arm64/arm64/trap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 15f1f5e86a08..d1a48a2fd9f4 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -277,6 +277,7 @@ data_abort(struct thread *td, struct trapframe *frame, uint64_t esr, } else if (!ADDR_IS_CANONICAL(far)) { /* We received a TBI/PAC/etc. fault from the kernel */ error = KERN_INVALID_ADDRESS; + pcb = td->td_pcb; goto bad_far; } else if (ADDR_IS_KERNEL(far)) { /*