From nobody Wed Aug 27 19:22:15 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 4cBvYN2WNTz65W4P; Wed, 27 Aug 2025 19:22:16 +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 4cBvYM6LHjz443c; Wed, 27 Aug 2025 19:22:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322535; 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=ei+vQcrT6VrBkLn96WiqLhimkLyPEd4XFGVI7D56B9k=; b=IZCggqxS2KqS2iEIZbLy29lM71jn+3SOKanQqYc8chlxWEGQZNmtaepBknmMV0gQGoG3vp J6CMuFXj40oYqlMqpW5rwEmYH4nbEtWTb/GPlCZndZbMa/o5V143sQ2vidb8OEiTE3LeIz 2augPVlkRjotFlf2KGvlVVgs4WbxtkFk0VS0M3Xn8N62Pw/+RuZ1PcU8DEpIwbkoE0Z6IB /lwrFFqhNWyTaAaUrJH6Hzcei3OxWPon40CWn5irkHDANktfkNz7xuex9huc51FWSOoq/V 2013IF8B9jXo9YMhO3I7TJkPthVUfq3q9o0dBFhdJUoTTMyt50/L26HWCWudRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322535; 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=ei+vQcrT6VrBkLn96WiqLhimkLyPEd4XFGVI7D56B9k=; b=vQhBmVuFRj0YyvJh+DW3Reyl9YUeCoUS/d4h6odpo8sphN4GH90wL7HCvTJWp8+HspjjKg 97LUKIYaZz2WjRNMePId0OldNJQlpqd5Sg/lfoi4VMGLcmnhuFbyQNk94yGoBIxRd2CsBA yjzMUsVkeIuXDnvl18hGg4xWxqMhaOAUh4LACDGdhE6uDdLhsvX57viUCwAMbc5n/n2CSY D2lQp0afRJFkTrC2FU3cU9CfVqoKK0L7m9J37H6K8kQ0wKcASPNxMtNnATlJOkl70zae5a pw3I9rM3K019v61RIAZjfD6WbHHXiOdouzIOXJTHZGZ3/SYAi0QaYE2RXrfQ2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756322535; a=rsa-sha256; cv=none; b=N0+L6k2LwVHZ6uNESPQ8lwij4xjHdcQL0HB3YxYhfSwaWo9wh5XSXeGUW3cNJyrCvZaOsh SOEkYYM+18MZ1WytKU0cqEILwnhXikAusqZfIiSbN/0ersZ9tOMBs2s4gff2LMz0CcYoQ1 35ggC2GisLV8O6Zt2rRouagtAa/JWwnRbU7DXjh76WgkyHH2YFuBhW4q9tondLmm54XawG SAacEteQEFzMKQoY6D9fGOaYxOxtvag4jx+GlZlUrRkjDCPZH2FoYJymTkNhIufIJe0wfr a2lLwR1vJtIriO9V4cbqlt1QDxqQQFiSoV5mYB7987bgT9N2yDBPEKFApLbcJg== 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 4cBvYM5mhrzbyF; Wed, 27 Aug 2025 19:22:15 +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 57RJMFMl041394; Wed, 27 Aug 2025 19:22:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57RJMFek041391; Wed, 27 Aug 2025 19:22:15 GMT (envelope-from git) Date: Wed, 27 Aug 2025 19:22:15 GMT Message-Id: <202508271922.57RJMFek041391@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 59fb30e78554 - stable/13 - getmntpoint: Don't compare st_rdev for non-devices 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 59fb30e78554a587a0954351cc7a682b4e24ecdb Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=59fb30e78554a587a0954351cc7a682b4e24ecdb commit 59fb30e78554a587a0954351cc7a682b4e24ecdb Author: Dag-Erling Smørgrav AuthorDate: 2025-08-17 17:07:45 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-27 18:50:57 +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 (cherry picked from commit 8073a5137f223bb481606b15edaa5ecb93ceffcb) --- sbin/mount/getmntopts.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c index 31987f7b0b78..fab25466425f 100644 --- a/sbin/mount/getmntopts.c +++ b/sbin/mount/getmntopts.c @@ -192,6 +192,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); }