From nobody Mon Jul 14 22:03:51 2025 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 4bgxD86dyhz62G3Y; Mon, 14 Jul 2025 22:03:52 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgxD80SZsz3mTg; Mon, 14 Jul 2025 22:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752530632; 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=B71cfIvsCM+IX1rcoF12Jd49HnZz8gnBdJjrETR49I8=; b=uHc7ozQOWQiYfVR/Z8bZQq5Ddu5xJY2GHUSPIkR/jsSdpJmL9DWRkHImOSk3FhcpyK3Ygm OPi++nK4pFW9/Ymh48l3eXWdow9AJqHszkgxTue4BbA08P+kWcXSgVcsijXFPwxLmQplPx 3F9feLI1NtBTCCH7lHeTu/LppWsK1Y599uTHU5R79c5iO1DrPO8HtRfU0Eeer5uzfiL7T1 uHa7Hz1CMU2SWWoyrzOfLVRaLR3tfANxkRxkHy4rpiP3pKjD3M+2P1DboHg2q7q+wteaNP HFPXLS+Oej6pxFxuTHlgwUTT6bj6Bdw4VcTKDIOWehvMPhSahBZypZP/wTOHVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752530632; 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=B71cfIvsCM+IX1rcoF12Jd49HnZz8gnBdJjrETR49I8=; b=J4slRwAMfHiYYdLNVGWbO8YwjE1yEaJEe7bJwusElfehs/TpwsiRauojW4VMzzddKyOHiF uNC1EY5aIlKa7WE0Mz8Bp7y0XP3kn0gX22dNBKjdlEKQZUz/nO6IP2A6eUsYbDQMVIrGYr n3cznbwQm+gBk33lym7wFuy2d5Ykfn5OhvKwgbSSCEbGh9ZCC/mc80wi3wUymMcGCLdrFK TVDvS6GG9sU1Ymn7MybSMd73VrcYB8/2GV87+M8ugliYCTlSF41LNLD7EcicbAfyz723RT Kthkk1EeO1NB8O+dxKCf8kdTUov9iP/7WtzSbXI1IcK9UCqGl4Ja1Q39yRVTKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752530632; a=rsa-sha256; cv=none; b=WzADkqulWYJvcD2mUOFeAMD77QZ3YG061UgoeWs/mhcd6Aj1yDW1DgV40EmIIIrEgyU9YA vqRYwiIiqbcfnbzt/od127xCsfVTMz8+19CjMwM3KTrzUglQgj0wRADUluI/1xszTjH/20 3+5I8mw13K7eJME+fDUhzC47emg2H/x5O3JML4Sn9MS5QjEyXnvao9clOvtQXqHlWds8UM VxbCzXSXzUgSWkwNksyobOFdyWBBxkorR258BjSSWbQuB3dr3o5DOqfJcn3LywdF6ti7NH rJsHjrhoGhMUq4Xl2Cwl5trdSiwvZ1Dksz5QTvS/1kMndYU6/r4kYWHI8OKyBg== 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 4bgxD76mLPz1Bfv; Mon, 14 Jul 2025 22:03:51 +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 56EM3ptx070747; Mon, 14 Jul 2025 22:03:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EM3p3H070744; Mon, 14 Jul 2025 22:03:51 GMT (envelope-from git) Date: Mon, 14 Jul 2025 22:03:51 GMT Message-Id: <202507142203.56EM3p3H070744@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 42f1054ef12d - main - ast: do not dereference NULL td_proc in CTR statement 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 42f1054ef12d10f3ba46770b985a320b0ceb9f2f Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=42f1054ef12d10f3ba46770b985a320b0ceb9f2f commit 42f1054ef12d10f3ba46770b985a320b0ceb9f2f Author: Konstantin Belousov AuthorDate: 2025-07-14 21:54:34 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-14 22:03:28 +0000 ast: do not dereference NULL td_proc in CTR statement If ast is called to clean up thread, as in ast_kclear(), td_proc is NULL. Guard against derefencing it in the trace. Reported by: pho Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/kern/subr_trap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 18388ae5f232..bac7d0080c71 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -338,8 +338,9 @@ ast_handler(struct thread *td, struct trapframe *framep, bool dtor) td->td_ast = 0; } - CTR3(KTR_SYSC, "ast: thread %p (pid %d, %s)", td, td->td_proc->p_pid, - td->td_proc->p_comm); + CTR3(KTR_SYSC, "ast: thread %p (pid %d, %s)", td, + td->td_proc == NULL ? -1 : td->td_proc->p_pid, + td->td_proc == NULL ? "" : td->td_proc->p_comm); KASSERT(framep == NULL || TRAPF_USERMODE(framep), ("ast in kernel mode"));