From nobody Sun Apr 20 23:24:01 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 4Zgl1t2wZRz5tmH2; Sun, 20 Apr 2025 23:24:02 +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 4Zgl1s5jttz42n0; Sun, 20 Apr 2025 23:24:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745191441; 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=YWWDf9pO/DKB+gjcdsrdIMmchD66lus7wi3QNLFb984=; b=v4JPUHbaf4IX3Mz0cshZOWqz4bbRzz0eYO2ECohYJUCuA7+7KjGCg063w7g460ljs4YNyI qUrimVf7RvGdA4NWLUul/xo7tKEKK1P0j2EkFMtTuXuSLWrjOIc0sCFKAWc0furOZqOla/ oqZMwzg/X44kcrJ4BaJspdvs7iRpQWPqtaYFDPXPa2jHMMGZI4iAr0duxHOus30pmUYx1x Vsnt71ajvAbxQE+nMO+VBCPnFA8fnxdkpNzfISmc+esmaFqQndVzfueWOW8qBh0EbWFa84 D9zYXlYfEi/B9H/1quihM8XnRRsB+QQh+K40NO77mrUrVhDWgG1HqJcbPX8r4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745191441; a=rsa-sha256; cv=none; b=saQf2O1D13C/bpT22U/+EEDfmnGhSjKQi2htvNY64/2QrXqzVu2pW5ay60dFvkpbAPkMCW o5CRlOVLfdVUrAjpgkd1+3eBdjABH3N5ufZZLjdKMBvZ7FBTpJs4Yl6Vlla6G1WYJls0WV R5PPG2M1H4e0LjRZOU6lH5jXbj95v1aUccuG5j4pQXCFCfV7CWBZAbVHh8BepoI01VKc2J uB0axe6K8+0BRbOT7MZ+KfUy/gcj0hwq8TZzgmd+1dpXDX7W57JooehcZAWGdAeHGqv/9Y gd7R7DQaxzh1Jy7Y4T7KH1jxvNtdBsqU+AHtdQy4X3az5BIOuAmk0aAH3/hRCw== 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=1745191441; 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=YWWDf9pO/DKB+gjcdsrdIMmchD66lus7wi3QNLFb984=; b=A5QbeyvQ7bqyaOqc0lH8rkuVqZwUU+hqfmWaF87io3Q03aOLeDEjn7doTKsnaC0Kqt90dr o+mZL7Y7eWe9iXA1Nxa+DvqZW7AbJq3q3yzUd/op40P9W6dET0U6qgGqhFHiLZE/B5eJ19 wnb5bncylpVSZKCrXwZWaiOeLjZfUbL9ZVK/j+eJ1BHlQ/IKzifQntvTG5U/lczzcKe378 DNzjvyGUGENxS56zN7PjI6mzXJs8R75RF9g5jygRieryIiqZytK8Lh5kMSjnlHS+XrEiDW KS0755f07IOlggyoSnylnmelRDRaXPxOBBxq/HOnPIbVece9WwDOkLXu9ia0TQ== 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 4Zgl1s5BzQz8y7; Sun, 20 Apr 2025 23:24:01 +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 53KNO16X072401; Sun, 20 Apr 2025 23:24:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53KNO1EG072398; Sun, 20 Apr 2025 23:24:01 GMT (envelope-from git) Date: Sun, 20 Apr 2025 23:24:01 GMT Message-Id: <202504202324.53KNO1EG072398@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: b1b607bd200f - main - vfs_vnops.c: Modify the O_NAMEDATTR check for Solaris compatibility 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: b1b607bd200fdd23724ec80738e55ad397bbe78f Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=b1b607bd200fdd23724ec80738e55ad397bbe78f commit b1b607bd200fdd23724ec80738e55ad397bbe78f Author: Rick Macklem AuthorDate: 2025-04-20 23:22:46 +0000 Commit: Rick Macklem CommitDate: 2025-04-20 23:22:46 +0000 vfs_vnops.c: Modify the O_NAMEDATTR check for Solaris compatibility The Solaris semantics for their O_XATTR flag is to use it for a file object in the file system's namespace to indicate that a named attribute for the file object should be open'd. To do this, the O_NAMEDATTR flag must be allowed with a non-named attribute directory. This patch changes vfs_vnops_cred() to allow this. This patch fixes 2ec2ba7e232d so that Solaris compatible semantics can be implemented by patched ZFS code. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D49899 Fixes: 2ec2ba7e232d ("vfs: Add VFS/syscall support for Solaris style extended attributes") --- sys/kern/vfs_vnops.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 6ad9c75564c3..f1d3ba2ac08b 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -285,18 +285,13 @@ restart: if ((error = namei(ndp)) != 0) return (error); if (ndp->ni_vp == NULL) { - if ((fmode & O_NAMEDATTR) != 0) { - if ((ndp->ni_dvp->v_mount->mnt_flag & - MNT_NAMEDATTR) == 0) - error = EINVAL; - else if ((vn_irflag_read(ndp->ni_dvp) & - VIRF_NAMEDDIR) == 0) - error = ENOENT; - if (error != 0) { - vp = ndp->ni_dvp; - ndp->ni_dvp = NULL; - goto bad; - } + if ((fmode & O_NAMEDATTR) != 0 && + (ndp->ni_dvp->v_mount->mnt_flag & MNT_NAMEDATTR) == + 0) { + error = EINVAL; + vp = ndp->ni_dvp; + ndp->ni_dvp = NULL; + goto bad; } VATTR_NULL(vap); vap->va_type = VREG;