From nobody Mon Feb 13 23:16:47 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 4PG0bM335Kz3qc2y; Mon, 13 Feb 2023 23:16:47 +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 4PG0bM2Yggz3NLB; Mon, 13 Feb 2023 23:16:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676330207; 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=4ft0PIZgDcluwyvuDk2FzTIcALGKw3YpnMXKH9x9hkY=; b=KpdpxabK5LYqg//O4cmsMyhs7b/nYpmdo8NyEYLRHQ2mSTBHkKQgg8WyCbtrq+3Dr3dUx6 hfymwQBJFsZiDrOtiV6sokydYe57c16Y7sjvrcOmHB68l0PGNzI0tvXNC8TIQqqYrUUWoO 0CNbnpUogTFQyrKJWOwfRGehfoFtasWApmTAaNNtyluFgvotHqbo0gmL/4X3JXw8OSJH1N g2VogIWoYCC1MKHdFketTYB6wLkDdNMLryJi+uygNa5yGSa/Y0QQA5qwIhlqfP//i00vra f+y5+EvlUvCTWPQV+5RWN2W5s+v5ThivDFNHe93PGKxtrDs1HPJCpuheH01AkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676330207; 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=4ft0PIZgDcluwyvuDk2FzTIcALGKw3YpnMXKH9x9hkY=; b=sqiH3QyX3rNabDqL/GcGwmeb5GcgKt2G0MWZIemJFSiXbVpvoDYr40rX7BqFCq3Mr47ckJ KfmEkxrxRaXUzbxF/OMu390FYT0wWj7FuYTa6ekN0PWk1LBzfzbCd4cIG6wUhEN456TjW8 y6aDuJGUg+Dlr1weMS+eFk7nhDipb3mFkfKAKscpwHuHLzEYgRfhRWcWxh2ay/0Cr7xT6U l0SSBh7zIhrxLfP2etWiAp+XP8Qqtbyf9qGknIWr1eEeYzCfO0I/7z9yVtXl4b8qv7K6VF 4vYiSW18pGyjzm+R7ifMkdnlcGrTYnnlYWXpKUe0QATFRBnuxxO+QH4WX1iekQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676330207; a=rsa-sha256; cv=none; b=WHjtbhPMfnjz4mmh6W0YP/FltXddVpLWaXDBUyTATnUGulAyrBmPzF1apbUE2hDBkMHhgV kPLGQUf4vyiBy3zT8BhQPvL3Pb3Dxqw8OWQiSyA1fvByEhOuikJPo6rjidV4tmf5MJoBfP gDs9o6aYmAJoczrDS7x7bwbRt5BY9znYtxNWCmN0fM8W+ts51oTnoyrLtbG7WEmEU9ytvD +2lK0hPIM2riiIlnToCVn7iN7o1d7/ZzKx8CZSAzP+zuNdeAngaOw7plSNKFSfEghBHDOK +bNtriQVKyQlKv6jkC82NUOzQ8ujVLG9YEWK3KXwPZor9sOsERAwoHMhphFpzA== 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 4PG0bM1NQLzcRF; Mon, 13 Feb 2023 23:16:47 +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 31DNGlZe044347; Mon, 13 Feb 2023 23:16:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31DNGlMm044346; Mon, 13 Feb 2023 23:16:47 GMT (envelope-from git) Date: Mon, 13 Feb 2023 23:16:47 GMT Message-Id: <202302132316.31DNGlMm044346@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: adc3506d56d7 - main - Extract tmpfs-specific part of tmpfs_access() into a helper 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: adc3506d56d76981a0e251080b186c26edb843b4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=adc3506d56d76981a0e251080b186c26edb843b4 commit adc3506d56d76981a0e251080b186c26edb843b4 Author: Konstantin Belousov AuthorDate: 2023-02-12 22:25:25 +0000 Commit: Konstantin Belousov CommitDate: 2023-02-13 23:16:38 +0000 Extract tmpfs-specific part of tmpfs_access() into a helper The helper tmpfs_access_locked() requires either the vnode or node locked for consistency of the access check, unlike the pure vnode op. Reviewed by: markj, mjg Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D38557 --- sys/fs/tmpfs/tmpfs_vnops.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index c7371de28896..cd460636b647 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -375,6 +375,23 @@ tmpfs_fplookup_vexec(struct vop_fplookup_vexec_args *v) return (vaccess_vexec_smr(mode, node->tn_uid, node->tn_gid, cred)); } +static int +tmpfs_access_locked(struct vnode *vp, struct tmpfs_node *node, + accmode_t accmode, struct ucred *cred) +{ +#ifdef DEBUG_VFS_LOCKS + if (!mtx_owned(TMPFS_NODE_MTX(node))) { + ASSERT_VOP_LOCKED(vp, + "tmpfs_access_locked needs locked vnode or node"); + } +#endif + + if ((accmode & VWRITE) != 0 && (node->tn_flags & IMMUTABLE) != 0) + return (EPERM); + return (vaccess(vp->v_type, node->tn_mode, node->tn_uid, node->tn_gid, + accmode, cred)); +} + int tmpfs_access(struct vop_access_args *v) { @@ -383,7 +400,6 @@ tmpfs_access(struct vop_access_args *v) struct tmpfs_node *node = VP_TO_TMPFS_NODE(vp); mode_t all_x = S_IXUSR | S_IXGRP | S_IXOTH; accmode_t accmode = v->a_accmode; - int error; /* * Common case path lookup. @@ -399,10 +415,8 @@ tmpfs_access(struct vop_access_args *v) /* FALLTHROUGH */ case VREG: if ((accmode & VWRITE) != 0 && - (vp->v_mount->mnt_flag & MNT_RDONLY) != 0) { - error = EROFS; - goto out; - } + (vp->v_mount->mnt_flag & MNT_RDONLY) != 0) + return (EROFS); break; case VBLK: @@ -415,20 +429,10 @@ tmpfs_access(struct vop_access_args *v) break; default: - error = EINVAL; - goto out; - } - - if ((accmode & VWRITE) != 0 && (node->tn_flags & IMMUTABLE) != 0) { - error = EPERM; - goto out; + return (EINVAL); } - error = vaccess(vp->v_type, node->tn_mode, node->tn_uid, node->tn_gid, - accmode, cred); - -out: - return (error); + return (tmpfs_access_locked(vp, node, accmode, cred)); } int