From nobody Wed Oct 01 18:33:25 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 4ccNps528Xz697Yc; Wed, 01 Oct 2025 18:33:25 +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 4ccNps4VDFz3lp3; Wed, 01 Oct 2025 18:33:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759343605; 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=1Y9ezyVW/VpeUKmAFim+2emHKIYJ5SdrGF3UOKQaP0Q=; b=OZyKYoQIG8pZh7fUn02/wFtfFRgX6DDy5TWgjA2+rK0Jm5+GqB9YzaJ1k3EaDfbcmq/w3X PeL/OfH9nOKFKHBh2S4OUO9dJdc0d071YB8hD44mTm/98LS0dHkGrDBtA6iwBzNIy0B/Io Ek5vIBqEmlWInv7tzQmr77nMUZC8OxeZU7n8RijCZfKg8pDVnpg8RFl0Ca4DBbQCruJhY1 FtG+0M67sMMsnrlo2StK5HKFIzJUVU9pvS+JV3kaD1V2XzfZ/QxLlFKCXBrVi4NKli0jsj elW6ta49FO+KgFM7deK+9vqrWRm+wjIdRzoTt84O1lKEu6h2JybWccdawL77Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759343605; 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=1Y9ezyVW/VpeUKmAFim+2emHKIYJ5SdrGF3UOKQaP0Q=; b=oaFrrFFKoMXG3/uRvxOs80Yh+BZqVoO8mzQiWKSz/H3ZC1f9Q6e3HLfQq4Fa5GczZvHx4Z kcNdQmONfY38iLgjd42YlvdO3gI7aeLELSpfdopg4MhXwJzCOv1N21bIF6tuzHZH7LYBEb y5acXS2/MP29JASOmvdrSj8IgkK3xENMtvYsmmciVRFWUH/FJbQq7zeILCHA8WYSDm1Uz0 wVDn7N/jTOT9Qy7y1pZyC9+MtgqBm5qE4cDbbqj7lqf3Q6cnvc99zCMhO7yO/Hdxg1KZN4 tOkOae3a3bFOdy+XGzsL0SB5Gk5E/uzzqHW+1ZkVbmmSv9OPp2EZwIMFUSslcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759343605; a=rsa-sha256; cv=none; b=dv+IJdoc/cU1tGuXGdeUdx+5qytfNayDPA9SnAyS1ZWT57q49MSpk/a7evfAY8Us+VWYAE 8MQ+VvVN3tUQW+gSXLb9n+Z0wPIOVSiPKJutz0O4+1sVLCcJeXo4unj2QTptzx1HQnVUvG 3pyQxBOCREKBkr6ecEe4ZmHPm+9bL+i3DFVBJGxc+HcfDA85w7qF27WHVm4QPUAGnGluW8 S/DrcprW+OK099jGjijjJ4+vDdndWDFoCKSVRkQAimH0gwTXxHnVFstIj61nT3RvU66hES W3YwnDLHGfmYjP18lnB0E2oIP7KE91e67ybR0gE7bzxRtw82B6N2EqHY8QegPQ== 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 4ccNps43LNzbBG; Wed, 01 Oct 2025 18:33:25 +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 591IXPfV040962; Wed, 1 Oct 2025 18:33:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 591IXPtQ040959; Wed, 1 Oct 2025 18:33:25 GMT (envelope-from git) Date: Wed, 1 Oct 2025 18:33:25 GMT Message-Id: <202510011833.591IXPtQ040959@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 76157a63a0c6 - main - ddb show lockedvnods: avoid trap for ufs vnode under construction 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: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76157a63a0c63dd7363f6c8ae60edc814b3c138a Auto-Submitted: auto-generated The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=76157a63a0c63dd7363f6c8ae60edc814b3c138a commit 76157a63a0c63dd7363f6c8ae60edc814b3c138a Author: Ryan Libby AuthorDate: 2025-10-01 18:25:27 +0000 Commit: Ryan Libby CommitDate: 2025-10-01 18:25:27 +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 --- 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);