From nobody Sun Aug 17 17:30:00 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 4c4jXT2T10z6521Z; Sun, 17 Aug 2025 17:30:01 +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 4c4jXT1tjsz43yb; Sun, 17 Aug 2025 17:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755451801; 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=840zsGrGvB/EXZqEyh3A7xK6wOUNRYh84TOGgdIZBdM=; b=l9CBSNGtRd8QmG1Xpj4kj2YXNTjXM7P4g4TxXAA/Z2p318cbXNCgcySbp2dtvOE5+k+3ya cl/APv13LZpc8l/1/2FJIact0n0mSYfHQ8i3qnX8mjGfujLkUesdZ3Nt2A9ZQRj65gv1yj XaPjxAichyvvU4shmFzyDwrk/N1uAPx0n0QUMPv2LjA0tW1+3Hna0r0kOdRH6IqJWuMa+0 2yGe/nRZECFk6aP9pkGS0PUDoXTMjl9KR5J4AK2ZmO4cM4ZZr/WIxaxaUP8TJKmNmaA7Nx MD+XzGJWfN1thPNX5DtMzJNJUSLOmZ7LkUYW4ETrpnfduog0y/MN4xmmkbjVCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755451801; 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=840zsGrGvB/EXZqEyh3A7xK6wOUNRYh84TOGgdIZBdM=; b=NXzla2mD8m786Nt50Vnv55ogA2PjkzVRBvLoKZM2w+pouUEZVSfrYWf4XpYuFGvnhzq0uy DSW/zVibvVm7mHWCCV48+F1jYU+5rrVSrrM+a7BZ7Zic/0jJCjjlStuVfmogKmpcG84Jlm 9X3+LisEdoH46qw2J3sBHrrrvHoycv4bVMAnTfBs88RJon79JlWrHU7WA9ikiNCOK/m0Bx Ihg99lQ15F+ir2a8ZBwm0xbNQIFXPxjTxyGyYMqZkXcV0r3hNo6tFhktx2lZg9T312pTO7 52TKm0e+g/coyQMLgprFUR04DhwcGVqqjB1NBikKRgGrVQki269Zz0vVcd/9lA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755451801; a=rsa-sha256; cv=none; b=FY8HETG2+n+Buws5dNNFP0RREnV5r49WOw1AxDNjqL3kCWcbMr0eq7uh02wWgsEOciZd5S QOgrRSfEOL5NMYcYZdsIiy87h60Mlr6LgyWnJ3o/YeIlh3w6n2Dgiao4Jz2BnIOUlo90QZ jcUDywV+G7PwoaZTPwnQiRlu7e8p6frG7dzoXp0FRQArxgU9iFBXH2yn8lq+qLDtxgyRiP JteMzUzRuBB6sFRiAFAesLVN/Z7sGqXp7l51NIfXIMrzbY/fa93RJ8I3YMS9aNXwQeVpD2 Yyv40wDbQEiGWCYVzomLcL6U4474Uo/e3/YjLFrzvqsY9RIYrQInWYf6t3imJg== 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 4c4jXT19vJz4ND; Sun, 17 Aug 2025 17:30:01 +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 57HHU0Yj072428; Sun, 17 Aug 2025 17:30:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57HHU0Xe072424; Sun, 17 Aug 2025 17:30:00 GMT (envelope-from git) Date: Sun, 17 Aug 2025 17:30:00 GMT Message-Id: <202508171730.57HHU0Xe072424@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 8073a5137f22 - main - getmntpoint: Don't compare st_rdev for non-devices 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8073a5137f223bb481606b15edaa5ecb93ceffcb Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=8073a5137f223bb481606b15edaa5ecb93ceffcb commit 8073a5137f223bb481606b15edaa5ecb93ceffcb Author: Dag-Erling Smørgrav AuthorDate: 2025-08-17 17:07:45 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-17 17:29:27 +0000 getmntpoint: Don't compare st_rdev for non-devices If the mntfromname of a mountpoint is not a device (e.g. nullfs, tarfs, procfs) we shouldn't compare st_rdev, as any match will be spurious. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D51945 --- lib/libutil/mntopts.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libutil/mntopts.c b/lib/libutil/mntopts.c index 1d9347e3108a..07d3dd6d98a3 100644 --- a/lib/libutil/mntopts.c +++ b/lib/libutil/mntopts.c @@ -185,6 +185,7 @@ getmntpoint(const char *name) strncpy(statfsp->f_mntfromname, device, len); } if (stat(ddevname, &mntdevstat) == 0 && + S_ISCHR(mntdevstat.st_mode) && mntdevstat.st_rdev == devstat.st_rdev) return (statfsp); }