From nobody Sun Aug 17 16:11:17 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 4c4gnd3ZdFz64wwT; Sun, 17 Aug 2025 16:11:17 +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 4c4gnd27nMz3wHL; Sun, 17 Aug 2025 16:11:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755447077; 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=XzF78YAr7bze4aO7sNPNei3dtohfBe93ullPY0kzvyI=; b=YQwOWBo8R2gv0Nf0SliQcemF1Sn+S416RkdWDx9o7UqqHWGeMOsvaPuBUXicikvT4ZshY2 raV34HRll5P4wyq3Q4mOI4Mq0Op3nq2CG3+P77DyNyUznll26/owVww9SNwbrVyercyLWa RcCElDaEj/o1N8oyvWlnKDGGPItI0hphe9uAY5jWDY/HHIJ/PBTWJwBMjNHa4Pw8do/EmK uJcCmDwYInvIyYUOlprgdNcoDiCJrKXV/oWrEW41UsptkdUYb/A7AU5OY5oqNkw+O9p4x6 boWgBcXcmjHsCpzyOo/QPa5sADfQyJ6Ia5rpzvqfWRlL//WV6ChVehgILE8y2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755447077; 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=XzF78YAr7bze4aO7sNPNei3dtohfBe93ullPY0kzvyI=; b=T8roFTCxVNADWsoAn4hbWyd/5ycdmYj6/T6gl0susaTE1ZeYvAGPsiKcfTQqaD4OTOF+B0 hdhkYuPVY0krXblrvsvKI4v22mNK+7kYUPiVZ4+ugjqHHe8mSQwWNXQf40SkD5mRZHNwK8 W5FXbZSbSj56v2k4uq04s7gWDmR2/AtZr5sOAO4xMi4ZeSKt9XIW3BSo0h07557fXZ7keB 4tyT6BYKzWk647PrIMluglhc5cTmWYgQaX+s+5epmqD9rZsyaSOu+a4uqttcbJCfwUM+cd nQBln3qtg7/o3jGjhsJ8QQXPdZVyVo7u/geqLER/81Vy1Mni+Ql0r94Tqe04cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755447077; a=rsa-sha256; cv=none; b=DDOPQrRudh2f6W6EU6QCIOGWwRSFou52ls0hWm9ppCD5kBn0sC3coVO3W3UAgTJWlrWKPF +5K8KxzXdbH+PrqM4LaTLS1oRFqdHjO1+0SBlnv1RGx4FAJn8M0xR9RelQSYv6hnwUxpgv Ms37Rjsi2DdgIpWrnSFATrqf4DmtAguwJ7c55CwZoMZ+CGY2EjI38ALGjJBW2WfT7eNYjV /HWPe8CSDvHfbZ1YIido5cPsNZbyx+1pxhGrg9KV28a04n4xx7Op/yp89tDHlPHwrXMEA6 DFqoGXCFdhbLIHGNBcQOkV9VAImbaw9aywloqTQJ8NEkirXSdbnrGqXqJ19Oaw== 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 4c4gnd1lwrz2GL; Sun, 17 Aug 2025 16:11:17 +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 57HGBH8w031147; Sun, 17 Aug 2025 16:11:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57HGBH2P031145; Sun, 17 Aug 2025 16:11:17 GMT (envelope-from git) Date: Sun, 17 Aug 2025 16:11:17 GMT Message-Id: <202508171611.57HGBH2P031145@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: 6fd60c4887cb - main - ufs: st_rdev is only meaningful for special nodes 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: 6fd60c4887cb08203f654e6aac6b4dbaaf76111b Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6fd60c4887cb08203f654e6aac6b4dbaaf76111b commit 6fd60c4887cb08203f654e6aac6b4dbaaf76111b Author: Konstantin Belousov AuthorDate: 2025-08-17 13:03:05 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-17 16:06:44 +0000 ufs: st_rdev is only meaningful for special nodes Instead of leaking di_db[0] (for regular files this is the index of the first block of the file), return NODEV when not a special node. Reported and reviewed by: des Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D51943 --- sys/ufs/ufs/ufs_vnops.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index ffc993aef9fc..c1cf2dcdaa9f 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -540,7 +540,8 @@ ufs_stat(struct vop_stat_args *ap) sb->st_uid = ip->i_uid; sb->st_gid = ip->i_gid; if (I_IS_UFS1(ip)) { - sb->st_rdev = ip->i_din1->di_rdev; + sb->st_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ? + ip->i_din1->di_rdev : NODEV; sb->st_size = ip->i_din1->di_size; sb->st_mtim.tv_sec = ip->i_din1->di_mtime; sb->st_mtim.tv_nsec = ip->i_din1->di_mtimensec; @@ -551,7 +552,8 @@ ufs_stat(struct vop_stat_args *ap) sb->st_blocks = dbtob((uint64_t)ip->i_din1->di_blocks) / S_BLKSIZE; sb->st_filerev = ip->i_din1->di_modrev; } else { - sb->st_rdev = ip->i_din2->di_rdev; + sb->st_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ? + ip->i_din2->di_rdev : NODEV; sb->st_size = ip->i_din2->di_size; sb->st_mtim.tv_sec = ip->i_din2->di_mtime; sb->st_mtim.tv_nsec = ip->i_din2->di_mtimensec; @@ -603,7 +605,8 @@ ufs_getattr( vap->va_uid = ip->i_uid; vap->va_gid = ip->i_gid; if (I_IS_UFS1(ip)) { - vap->va_rdev = ip->i_din1->di_rdev; + vap->va_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ? + ip->i_din1->di_rdev : NODEV; vap->va_size = ip->i_din1->di_size; vap->va_mtime.tv_sec = ip->i_din1->di_mtime; vap->va_mtime.tv_nsec = ip->i_din1->di_mtimensec; @@ -612,7 +615,8 @@ ufs_getattr( vap->va_bytes = dbtob((uint64_t)ip->i_din1->di_blocks); vap->va_filerev = ip->i_din1->di_modrev; } else { - vap->va_rdev = ip->i_din2->di_rdev; + vap->va_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ? + ip->i_din2->di_rdev : NODEV; vap->va_size = ip->i_din2->di_size; vap->va_mtime.tv_sec = ip->i_din2->di_mtime; vap->va_mtime.tv_nsec = ip->i_din2->di_mtimensec;