From nobody Tue Oct 17 16:41:39 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 4S909v74GMz4xkGj; Tue, 17 Oct 2023 16:41:39 +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 4S909v63y1z4Qqg; Tue, 17 Oct 2023 16:41:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697560899; 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=CzyM3ATpZRCv0UQ1fXNZlfYdE4tUxS2hD9aUitdWCCo=; b=xX72rYK6GC9NuBUnoHUNZK88aPtjw8fuDztJ9xc8fauuNI+epJQDwBNHw0SSAmCK9wAAi3 pyy8KmvoBmz+VYUJjpD/vzZcaQVgBWhAJ6FDtQHzFcJNhiVmEBi2/AqfOev+YO/rlnntMf O5gZ3bUNMmivRhr68fUPu1LCCY3HtKCClTa1zI5SPySEIhPKTmO0m03DVrlto5p3l7CbeG 0MiUD9Am/6+t36I/rBq+5dHi50WhjThUK9eWzl+SQmIHRCjcRPZcsnSbFyhUaDw+tDmOro GpoT+WhngvVqD5UTMF7/Sycpz8MAaRKAYRqV9LX4VAaNwqvTIyCGiAg1CGzF7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697560899; a=rsa-sha256; cv=none; b=ge8taFMR/xcTLK5DddIKmTptENu0wRl+4C3w+WezaPeBfIsXlmzyJl/AbNlxKyR6LneEaG tIREBTvfohbfTMamYU5Kq51eSFJwgInfz2r1gSsLKpASpSm4x2sDyXjbivcTcKj+c7JcQP kYoKMbNC4qIijM7uGbph6yHjd/r2xsEJAaHt2VbOxhkatls16EYFIL4KprB8x1TL9JKMQG d/hsjA8SOXw7Amm6Fny/dyri+QYiI7H3o+gZgyNS4cJcY1QcOGERQEXyJ45p+e5MbEcUQF g4JBRP6ce6lgIfJtZabSZxO7MAV7e3lgz/At72lFjCaasYGOFaRuiG/H/1RSlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697560899; 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=CzyM3ATpZRCv0UQ1fXNZlfYdE4tUxS2hD9aUitdWCCo=; b=tlw5WDuaApF4Bw18DbWPJW0nPv+bsd76JMf0o0lgGCBV45b/da/hg+3Wo7+Ft+d7g4SuRX kdC0IlC9PV6rKoYydMrTTsAMY1OC06hn5J5ildyI+DBBDUcvwaAffx9smryozUIzvWkB8u uqcivcS30MwLo7sW0Za0oNo+c30k0gCjDx+JyLRpV8Cx9xK4GmCBulSlTXkYbBmbesgGU4 3gt7gfPIHnoI7jQ7YtLUGtmNXi6ehA2RqBHO7x6DnVkJZRF25sQvcrTe+aDQkczoxD5fAZ pwjvu6w+RIGsQTgrgLgfpypJ6uWrA06X4SDLUJO7f4H7dsLx85+3+hxlNBfy8g== 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 4S909v4qdhzXPw; Tue, 17 Oct 2023 16:41:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HGfdEj009906; Tue, 17 Oct 2023 16:41:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HGfdZJ009903; Tue, 17 Oct 2023 16:41:39 GMT (envelope-from git) Date: Tue, 17 Oct 2023 16:41:39 GMT Message-Id: <202310171641.39HGfdZJ009903@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: 9ef7a491a423 - main - nmount(MNT_UPDATE): add optional generid fsid parameter 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ef7a491a4236810e50f0a2ee8d52f5c4bb02c64 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9ef7a491a4236810e50f0a2ee8d52f5c4bb02c64 commit 9ef7a491a4236810e50f0a2ee8d52f5c4bb02c64 Author: Konstantin Belousov AuthorDate: 2023-09-29 18:42:50 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-17 16:40:12 +0000 nmount(MNT_UPDATE): add optional generid fsid parameter to check looked up path against specific mounted filesystem. Reviewed by: mjg Tested by: Andrew Gierth Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D42023 --- sys/kern/vfs_mount.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 8364081585f8..aa4642c0ba8c 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1313,9 +1313,10 @@ vfs_domount_update( struct vnode *rootvp; void *bufp; struct mount *mp; - int error, export_error, i, len; + int error, export_error, i, len, fsid_up_len; uint64_t flag; gid_t *grps; + fsid_t *fsid_up; bool vfs_suser_failed; ASSERT_VOP_ELOCKED(vp, __func__); @@ -1378,10 +1379,24 @@ vfs_domount_update( VI_UNLOCK(vp); VOP_UNLOCK(vp); + rootvp = NULL; + + if (vfs_getopt(*optlist, "fsid", (void **)&fsid_up, + &fsid_up_len) == 0) { + if (fsid_up_len != sizeof(*fsid_up)) { + error = EINVAL; + goto end; + } + if (fsidcmp(&fsid_up, &mp->mnt_stat.f_fsid) != 0) { + error = ENOENT; + goto end; + } + vfs_deleteopt(*optlist, "fsid"); + } + vfs_op_enter(mp); vn_seqc_write_begin(vp); - rootvp = NULL; MNT_ILOCK(mp); if ((mp->mnt_kern_flag & MNTK_UNMOUNT) != 0) { MNT_IUNLOCK(mp);