From nobody Tue Oct 28 09:49:42 2025 X-Original-To: dev-commits-src-branches@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 4cwlw643bMz6DbG9; Tue, 28 Oct 2025 09:49:42 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwlw63FxHz3DCv; Tue, 28 Oct 2025 09:49:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761644982; 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=df+lJS7u2bINciiXb27RWHY/CYrWQ9c1ScSfelHjMe4=; b=yNUFBPJ2AGbjWHfgg/nTh+T1TFAMgmU/wSXjv3x8jsXmzD+zSGbTPcD6h/6osQRgkSu8bZ UzM1u0o6WOXthp3v7WvQOeXMp8CfzPv6L0BnZ71bN++vl38p5uow8K6/m8KOykpND2QVfW kbA7taEkTbkCfsVy8KISyUsdl+vP912Kq1wnvCmLVG+/l/brWLAPT4AoOc5orSjmdfjUnu UOXUujNDJv3pR83br99UjQPNmKULsIEXCxOhacejVivvn/PdeM/5mduK9HrzaPPod5/Bvi 2ZzhG+nkCvbNQ4k0IA59qYvYcE/RwOOPBqX1cMtD6JIaT9O7L1MQp9sDyya7XQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761644982; 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=df+lJS7u2bINciiXb27RWHY/CYrWQ9c1ScSfelHjMe4=; b=idUC+/feWQnZGR0O1nGzrgB7W7VGF4DFO9RJtuEhT8g3ZUrNCS7/yTkSF4NoHeXiliYQnH Z4VpKFBfQa2zILEGASvgwoCRQX7y8EcKDUjaXxcKyCoTamL0hlUAP+Pix3EeopfIPAvMyH Eyw6GdSI9M27BfVndjHB6Oa94+QkYQTJfQ7utmj7ogU716hop24YbKna+gU1T5avU1vWq3 H49HZPWUfomrZlRNrs96ErDHk5E34dDV0Adu4wtWC6Qwfqwq3JoZAYFgYTbk+sK+gtmtVG l0eK/zeTKG7bQlKlzQ9DJo4shZ7GPrsuB7UsDQL/Iq6uj/hQuEPvmbppgvxmCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761644982; a=rsa-sha256; cv=none; b=QQf+5A7SpuSQr7r6Rwd/M31sLQ4ImO2CRX34W4sKTAXw2OQhQjV70nmjPCdKr7yFe8q1DY 4QnPZiDkSrjbqXmB2z2EKgkmBCju8jgUP8k+q5e1yi5jXX3EmeddgoeD1aEAGU6sv24JH3 FQWQHXv+ugkyyeAXCMZZnC1z1gfu0nUFUN0I1r7CaQWaGzzIQKf1qux/XhWqibUgGaWpzl f+9XRJEOJq0oRnJ0mkZmBhgUJHM0bHVcQ/Gjp3E32VofIZG/RFpBSdVeC0r0iTZeU03GrD mpXSDtfwtawRCp0QSWR6WLLAih2YEnKpwv04XooLasPKR52SwzCRcYXCYZs6JA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cwlw62h1bzlSk; Tue, 28 Oct 2025 09:49:42 +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 59S9ng66056838; Tue, 28 Oct 2025 09:49:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59S9ngi6056835; Tue, 28 Oct 2025 09:49:42 GMT (envelope-from git) Date: Tue, 28 Oct 2025 09:49:42 GMT Message-Id: <202510280949.59S9ngi6056835@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ryan Libby Subject: git: a2ce3bd0df22 - stable/15 - ddb show lockedvnods: avoid trap for ufs vnode under construction List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a2ce3bd0df225da1eccac9f195ae10252be7ec79 Auto-Submitted: auto-generated The branch stable/15 has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=a2ce3bd0df225da1eccac9f195ae10252be7ec79 commit a2ce3bd0df225da1eccac9f195ae10252be7ec79 Author: Ryan Libby AuthorDate: 2025-10-01 18:25:27 +0000 Commit: Ryan Libby CommitDate: 2025-10-28 09:20:35 +0000 ddb show lockedvnods: avoid trap for ufs vnode under construction ddb show lockedvnods might find a ufs vnode after it is inserted into the mount queue in ffs_vgetf but before the dinode is allocated. Avoid trapping by testing for the dinode pointer. Reviewed by: markj Discussed with: mjg Sponsored by: Dell Inc. Differential Revision: https://reviews.freebsd.org/D52795 (cherry picked from commit 76157a63a0c63dd7363f6c8ae60edc814b3c138a) --- sys/ufs/ufs/ufs_vnops.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 0921eee92b9d..736c5a66267e 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -2592,8 +2592,12 @@ ufs_print( printf("\tnlink=%d, effnlink=%d, size=%jd", ip->i_nlink, ip->i_effnlink, (intmax_t)ip->i_size); - if (I_IS_UFS2(ip)) - printf(", extsize %d", ip->i_din2->di_extsize); + if (I_IS_UFS2(ip)) { + if (ip->i_din2 == NULL) + printf(", dinode=NULL (fields omitted)"); + else + printf(", extsize=%d", ip->i_din2->di_extsize); + } printf("\n\tgeneration=%jx, uid=%d, gid=%d, flags=0x%b\n", (uintmax_t)ip->i_gen, ip->i_uid, ip->i_gid, (uint32_t)ip->i_flags, PRINT_INODE_FLAGS);