From nobody Sun Apr 20 23:20:09 2025 X-Original-To: dev-commits-src-main@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 4ZgkxP6XPwz5tlmJ; Sun, 20 Apr 2025 23:20:09 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZgkxP5xcqz3yv9; Sun, 20 Apr 2025 23:20:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745191209; 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=IhCSRo7MR7fYWMYvcszJw7VJgNRlK9h+n2GlH8TPE1E=; b=hORW7p5Y5ZG8ERZohCDcOPzm5Hlb0RMJrHR4htiAVglP3R8WbANhnFHRcw6KbKI+wQNYzC YPAGR5XhT7UsDntSCEBiIPQ03SoqwcYNIYARusSwpmLywkzLkBw3u1U+17p657AAayd3Oo r3Xqrqq9QQYq2rc/QjKQXMz2CJJ+R5MkD0LQvo8kGkwkwfy2tYyohK50tWkY5mZilIYijR 54PjGjNIbIky3xeFGg1g3GNLQXbd5x9sTgvMWx2kpMBJTq6ipITMBTzj4BSQjgiIxADebU +Z/iGHrR+IB8zmfZ1QF3u1WvvVttIdBBSssxxO45VycThbPM4hYIvRdRak8l3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745191209; a=rsa-sha256; cv=none; b=c7nrYUdg/RhpGlyV0A6yEzPPFZ4Bj6OsikS+VrOkMssjZb2ouAM4p0plkFaV3L1GYS+lqg kOjO09ADdsymItVRWTwqYCsgjLRQopu1v/WYXHlgStoj/zaa9DGM3IAbz5eIXnmxtV2gVZ RcJPoD2ScL5Y2/FGiIyb4JcQydfe2hYQwoCw8vTg5p7FHEdSHa4p6shr8JpSTS9qenc8yu WHrQ7HHw3YXtl1DDMn/KCOr+vC6rF3/m2VTBaf5xVMmJd2JRNDxyFmJ4tibwPGNx5imLwi VDDJrvHKjIwVu+Nabpt8H2a5dGXhlx0evSH5GInrXqVvFowYP6TlqH6AKaym9w== 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=1745191209; 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=IhCSRo7MR7fYWMYvcszJw7VJgNRlK9h+n2GlH8TPE1E=; b=xk41CqmpVLZK040LT1xI4P5MT5vf33cOvGmztnsHyyhY1/8aY+n35589mpC06FpKxmc1Jy GAyq4GUiadxuWW7Sda7PYQgsjALMQJ0H0/aToDdTcW5YK1YlEplF/PA2yHvGA5SQE5xgOV p7aGG6iiQVIZq9tHmClorFcmapa/rrSsxpXep6usFNahXSR9hB7DyF9A+/rkLMeUe9hfuF rJgxLGjPKxi/4igbnNLdBgVTt9ORd20mQYm+fyDeTXaKLbieE+H14Rtktf9so4pCMaPqxH drhU6f+W0xnkIA3gYlfAC8mzF6ljeFjdtpHjLdUizgXjsSq5Wbpom4ucDArWxg== 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 4ZgkxP501Pz8hj; Sun, 20 Apr 2025 23:20:09 +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 53KNK9nB059060; Sun, 20 Apr 2025 23:20:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53KNK9F9059055; Sun, 20 Apr 2025 23:20:09 GMT (envelope-from git) Date: Sun, 20 Apr 2025 23:20:09 GMT Message-Id: <202504202320.53KNK9F9059055@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: ee95e4d02dbd - main - vfs_vnops.c: Fix the named attribute check for open List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee95e4d02dbdd59daed46bbf2170897c1c2a8894 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=ee95e4d02dbdd59daed46bbf2170897c1c2a8894 commit ee95e4d02dbdd59daed46bbf2170897c1c2a8894 Author: Rick Macklem AuthorDate: 2025-04-20 23:19:05 +0000 Commit: Rick Macklem CommitDate: 2025-04-20 23:19:05 +0000 vfs_vnops.c: Fix the named attribute check for open In vn_open_cred(), the correct check for O_NAMEDATTR was done when O_CREAT was specified, but the file already exists. (Added by commit 2ec2ba7e232d, which will be listed as a Fixes: in the commit log message.) This correct check was not copied to the case where O_CREAT has not been specified. This patch fixes this. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D49898 Fixes: 2ec2ba7e232d ("vfs: Add VFS/syscall support for Solaris style extended attributes") --- sys/kern/vfs_vnops.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 4a369559111e..6ad9c75564c3 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -222,6 +222,25 @@ open2nameif(int fmode, u_int vn_open_flags) return (res); } +/* + * For the O_NAMEDATTR case, check for a valid use of it. + */ +static int +vfs_check_namedattr(struct vnode *vp) +{ + int error; + short irflag; + + error = 0; + irflag = vn_irflag_read(vp); + if ((vp->v_mount->mnt_flag & MNT_NAMEDATTR) == 0 || + ((irflag & VIRF_NAMEDATTR) != 0 && vp->v_type != VREG)) + error = EINVAL; + else if ((irflag & (VIRF_NAMEDDIR | VIRF_NAMEDATTR)) == 0) + error = ENOATTR; + return (error); +} + /* * Common code for vnode open operations via a name lookup. * Lookup the vnode and invoke VOP_CREATE if needed. @@ -334,17 +353,7 @@ restart: goto bad; } if ((fmode & O_NAMEDATTR) != 0) { - short irflag; - - irflag = vn_irflag_read(vp); - if ((vp->v_mount->mnt_flag & - MNT_NAMEDATTR) == 0 || - ((irflag & VIRF_NAMEDATTR) != 0 && - vp->v_type != VREG)) - error = EINVAL; - else if ((irflag & (VIRF_NAMEDDIR | - VIRF_NAMEDATTR)) == 0) - error = ENOATTR; + error = vfs_check_namedattr(vp); if (error != 0) goto bad; } else if (vp->v_type == VDIR) { @@ -363,10 +372,10 @@ restart: if ((error = namei(ndp)) != 0) return (error); vp = ndp->ni_vp; - if ((fmode & O_NAMEDATTR) != 0 && (vp->v_mount->mnt_flag & - MNT_NAMEDATTR) == 0) { - error = EINVAL; - goto bad; + if ((fmode & O_NAMEDATTR) != 0) { + error = vfs_check_namedattr(vp); + if (error != 0) + goto bad; } } error = vn_open_vnode(vp, fmode, cred, curthread, fp);