From: Gao Xiang <hsiangkao@redhat.com>
To: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: linux-fsdevel@vger.kernel.org,
LKML <linux-kernel@vger.kernel.org>,
Gao Xiang <hsiangkao@redhat.com>,
Stephen Smalley <sds@tycho.nsa.gov>,
Chengguang Xu <cgxu519@mykernel.net>,
Chao Yu <yuchao0@huawei.com>
Subject: [PATCH] xattr: fix EOPNOTSUPP if fs and security xattrs disabled
Date: Wed, 27 May 2020 12:40:37 +0800 [thread overview]
Message-ID: <20200527044037.30414-1-hsiangkao@redhat.com> (raw)
commit f549d6c18c0e ("[PATCH] Generic VFS fallback for security xattrs")
introduces a behavior change of listxattr path therefore listxattr(2)
won't report EOPNOTSUPP correctly if fs and security xattrs disabled.
However it was clearly recorded in manpage all the time.
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Stephen Smalley <sds@tycho.nsa.gov>
Cc: Chengguang Xu <cgxu519@mykernel.net>
Cc: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Gao Xiang <hsiangkao@redhat.com>
---
Noticed when reviewing Chengguang's patch for erofs [1] (together
with ext2, f2fs). I'm not sure if it's the best approach but it
seems that security_inode_listsecurity() has other users and it
mainly focus on reporting these security xattrs...
[1] https://lore.kernel.org/r/20200526090343.22794-1-cgxu519@mykernel.net
Thanks,
Gao Xiang
fs/xattr.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/fs/xattr.c b/fs/xattr.c
index 91608d9bfc6a..f339a67db521 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -352,13 +352,15 @@ vfs_listxattr(struct dentry *dentry, char *list, size_t size)
error = security_inode_listxattr(dentry);
if (error)
return error;
- if (inode->i_op->listxattr && (inode->i_opflags & IOP_XATTR)) {
- error = inode->i_op->listxattr(dentry, list, size);
- } else {
- error = security_inode_listsecurity(inode, list, size);
- if (size && error > size)
- error = -ERANGE;
- }
+
+ if (inode->i_op->listxattr && (inode->i_opflags & IOP_XATTR))
+ return inode->i_op->listxattr(dentry, list, size);
+
+ if (!IS_ENABLED(CONFIG_SECURITY))
+ return -EOPNOTSUPP;
+ error = security_inode_listsecurity(inode, list, size);
+ if (size && error > size)
+ error = -ERANGE;
return error;
}
EXPORT_SYMBOL_GPL(vfs_listxattr);
--
2.24.0
next reply other threads:[~2020-05-27 4:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-27 4:40 Gao Xiang [this message]
2020-06-23 10:10 ` [PATCH] xattr: fix EOPNOTSUPP if fs and security xattrs disabled Gao Xiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200527044037.30414-1-hsiangkao@redhat.com \
--to=hsiangkao@redhat.com \
--cc=cgxu519@mykernel.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sds@tycho.nsa.gov \
--cc=viro@zeniv.linux.org.uk \
--cc=yuchao0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).