From nobody Mon Feb 6 23:17:58 2023 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 4P9hxz1yYvz3nZ8Q; Mon, 6 Feb 2023 23:17:59 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P9hxz1JSpz4Nsj; Mon, 6 Feb 2023 23:17:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675725479; 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=ggA6UXotCOkGyAPu8JMD4AXoRBKvavQL7QTRkH404DQ=; b=SPNZf6gsY2f0SY3fpCcRWM7NwzcefZufS2M+RbMOj3mCwtpnpjRXOGeloCU13Ll1XKOww2 E8ZC9Rive32212z7XMLPDkJO/aYpwyqLRSOfIvKMW60bZN2Vh7CP5GD2kcfgKyjvftvVQQ fi4jTgqvBl2AgZgpHWVrJJS5WPhanrD2ddXk08JgbuIwlJDcMMWsYvpVc0OuHjIN5O4MWf 4tqp0mwrHELkYqfmfCHYhrEw820T5oqO2vu8jgZ0c5PKs2NBxrzdsNc3dGTEa0voQm7OGH LIhPyK6C0359Mtr28orFTtnUc31tBsy/ptQplMvo3pvEyyinTDQA+yOv7UXnWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675725479; 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=ggA6UXotCOkGyAPu8JMD4AXoRBKvavQL7QTRkH404DQ=; b=gvtY/p74ffdtrO/pBmLxBdy97pg6Ymu+WfAFuXHpFINFTxYvrVUFCJJ+6FE9d+cgmdxcuL nJ/3LCACuAEyll9o7P2RfSqtNIrmR6b3EGeqXFazF+38urh0YCemVt0GsfXxjbdLXGDCua DIsej3XhrMVp+vIxJuuoVVgONRUwJducrtDwsupoIV99LDDIdj26vYseIyLP3S5jMhefa/ Uw70ekMV94zpSMK8LG8KpI225m/e/9nokR4O2HBN/3D35eWfTmlDk5njnpJOTKwOT9mu1e 6FrU/Ik4lGZCoMqwNm/RCcK4dSDXA7oxBC1DT79LNOV+O/p5Bgwf5AWZrD8gAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675725479; a=rsa-sha256; cv=none; b=CJg40k+ge41NRxdgo98Oc42rpq9GkTMYwjEteOz27sqinImb/EfbDVSvpYl8cne6M4cVbf IBHIKcedeGSd4C/h18pnN3nnIk17vzeDeA7O+IFcFuqPPa5kTSs3NSVXGbLLCB0I7TTepP yGqlEtHxMObVWuhJ8C/vaylcKUbENMh8/Z0BjcaW+eKOhUH0zNTF1apjDJKANOcB777dT2 SvS4YVVdoyF/IMuFaoA2OyUaW78QHl2uEtVG8/qzVfYHUVwr0OhvA9NGYIQi7N59+9+v0v 2awQKE2j1J9bDbbpGw1TeCNwYfD34C4HiTy5otIo8mUFfMK95+FKstD5J8cvfA== 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 4P9hxy70L0ztft; Mon, 6 Feb 2023 23:17:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 316NHw6G037650; Mon, 6 Feb 2023 23:17:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316NHwf3037649; Mon, 6 Feb 2023 23:17:58 GMT (envelope-from git) Date: Mon, 6 Feb 2023 23:17:58 GMT Message-Id: <202302062317.316NHwf3037649@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 975ebddbf547 - stable/13 - Fix for getmntpoint(3) when checking for NFS mount points. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 975ebddbf5475cbe7748a37cd0308606525f9956 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=975ebddbf5475cbe7748a37cd0308606525f9956 commit 975ebddbf5475cbe7748a37cd0308606525f9956 Author: Kirk McKusick AuthorDate: 2023-01-29 23:12:48 +0000 Commit: Kirk McKusick CommitDate: 2023-02-06 23:17:39 +0000 Fix for getmntpoint(3) when checking for NFS mount points. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37907 (cherry picked from commit ad055467bec35885dc3eff2f4dd765f5b2f53259) --- sbin/mount/getmntopts.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c index 7702da903749..3a5cac0d9bac 100644 --- a/sbin/mount/getmntopts.c +++ b/sbin/mount/getmntopts.c @@ -177,6 +177,11 @@ getmntpoint(const char *name) mntsize = getmntinfo(&mntbuf, MNT_NOWAIT); for (i = 0; i < mntsize; i++) { statfsp = &mntbuf[i]; + if (isdev == 0) { + if (strcmp(name, statfsp->f_mntonname)) + continue; + return (statfsp); + } ddevname = statfsp->f_mntfromname; if (*ddevname != '/') { if ((len = strlen(_PATH_DEV) + strlen(ddevname) + 1) > @@ -185,12 +190,8 @@ getmntpoint(const char *name) continue; strncpy(device, _PATH_DEV, len); strncat(device, ddevname, len); - strncpy(statfsp->f_mntfromname, device, len); - } - if (isdev == 0) { - if (strcmp(name, statfsp->f_mntonname)) - continue; - return (statfsp); + if (stat(device, &mntdevstat) == 0) + strncpy(statfsp->f_mntfromname, device, len); } if (stat(ddevname, &mntdevstat) == 0 && mntdevstat.st_rdev == devstat.st_rdev)