From nobody Wed Aug 27 19:22:12 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 4cBvYJ6M4Lz65WDy; Wed, 27 Aug 2025 19:22:12 +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 4cBvYJ3llcz43k8; Wed, 27 Aug 2025 19:22:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322532; 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=xV47aeDH1pM8liOkwBuM7ZTd7NrVvaVM4G8C287mjhw=; b=auKAlVSkXv2s1dDdal2YWWDJe5ry16bYYZkNYTUm72BrgsKIDDRFVb3pY4sJN4CZx4dzgB 0XLoI26uoZMEMqgUDH5wF/bGZxs3Oy29eMVTMam14XbHEK4qlP2dbniDL/o8U7uMKUTZsH 2CXI+A3TmBA3TdmQYsfFd4mIMbbEFHCcCFprfrxjrKbHDsWfOViXl7NH8WfyOl+diCasx0 n1+z1S8xN2Y03OzVRnGCXjy2mkAE7yJVjodQ4G0HJV3YzoEs6I+XrG9P5Aj829joFnUub5 HftE9fIzsjaClCWbLtd2/ZPS9JD7ApWRoTrkV0QH/LRAf10sx2eg0e6aXwDgMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322532; 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=xV47aeDH1pM8liOkwBuM7ZTd7NrVvaVM4G8C287mjhw=; b=MGgiE21bDBorfD0flnaOIabJm73EvH6+GO4VtJF0R3uod8iLS15Ivgi3UIz+d7LjqyuDZJ yzTseK2cA2aVd5EC4ksok5Ye1ClDyBKbGPDad0zpVNHByrqgMqQ9XjIPGnsznzf01knZHR HW38ZAIpXtcZLv1SDOd2pcE0xOBr378i645CRnAD6m1kK6Pq9SsG+81a6SftxsUCJNP/Xv a9YhfFIWMpATguxbkB1Bzr3f+Rl6rg9tk2w+JN32M1tpXDln4oShYM42LpSu5MJzpEcmXY Em/VXSMeZiesk2+/YecInmkdI35Ll0pguwnywYmMnKg3NGq8B6c88y4op01HjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756322532; a=rsa-sha256; cv=none; b=txSE4oFBWnORtimP9I9SX0uDX3wE2rLy85DwcAFewFugLdOSa1Tdjau2E9FKLlKGhp4/oT yPZR3QnFI/nYRDzDqEVhw5c+GscfmhI1zhuOhoRaL8uXZeXP43ZsfE/pzu+HcCMdoWeDRh 4p0g9SY/ABk65oizwDNZJblFyiQQQQObgTEHQn4kC6xxWgBPZcZzUhMf7sa5yQ2fL4wJyS RZEYY2aaxuU0zOCjf3vA491/SeXbDHRdn101DtHQdmTTWDO66auyqfB/Ar2z6Aj4lJMkoY FugZ6rt7gZ56Vl2mTjJElZy4SDmxHgntWPXaV56JtALA5PLnguyYUSqwNsEGHQ== 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 4cBvYJ3JBFzc8p; Wed, 27 Aug 2025 19:22:12 +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 57RJMCja041179; Wed, 27 Aug 2025 19:22:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57RJMCNN041175; Wed, 27 Aug 2025 19:22:12 GMT (envelope-from git) Date: Wed, 27 Aug 2025 19:22:12 GMT Message-Id: <202508271922.57RJMCNN041175@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: d62cfe703fd1 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: d62cfe703fd1fb53bc0006b3724428a3dc8991f1 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d62cfe703fd1fb53bc0006b3724428a3dc8991f1 commit d62cfe703fd1fb53bc0006b3724428a3dc8991f1 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-17 17:07:45 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-27 18:49:58 +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); }