diff options
| author | Jeff Layton <jlayton@kernel.org> | 2023-05-16 08:46:54 -0400 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2023-05-17 15:25:20 +0200 |
| commit | 3a7bb21b6f49b4d1695d4ba8ff31e9619cbcebe3 (patch) | |
| tree | 5fb290b407ddb9e6e0e4cfde498a37f57340cc13 /fs/xattr.c | |
| parent | f15afbd34d8fadbd375f1212e97837e32bc170cc (diff) | |
| download | lwn-3a7bb21b6f49b4d1695d4ba8ff31e9619cbcebe3.tar.gz lwn-3a7bb21b6f49b4d1695d4ba8ff31e9619cbcebe3.zip | |
fs: don't call posix_acl_listxattr in generic_listxattr
Commit f2620f166e2a caused the kernel to start emitting POSIX ACL xattrs
for NFSv4 inodes, which it doesn't support. The only other user of
generic_listxattr is HFS (classic) and it doesn't support POSIX ACLs
either.
Fixes: f2620f166e2a xattr: simplify listxattr helpers
Reported-by: Ondrej Valousek <ondrej.valousek.xm@renesas.com>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Message-Id: <20230516124655.82283-1-jlayton@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'fs/xattr.c')
| -rw-r--r-- | fs/xattr.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/fs/xattr.c b/fs/xattr.c index fcf67d80d7f9..e7bbb7f57557 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -985,9 +985,16 @@ int xattr_list_one(char **buffer, ssize_t *remaining_size, const char *name) return 0; } -/* +/** + * generic_listxattr - run through a dentry's xattr list() operations + * @dentry: dentry to list the xattrs + * @buffer: result buffer + * @buffer_size: size of @buffer + * * Combine the results of the list() operation from every xattr_handler in the - * list. + * xattr_handler stack. + * + * Note that this will not include the entries for POSIX ACLs. */ ssize_t generic_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size) @@ -996,10 +1003,6 @@ generic_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size) ssize_t remaining_size = buffer_size; int err = 0; - err = posix_acl_listxattr(d_inode(dentry), &buffer, &remaining_size); - if (err) - return err; - for_each_xattr_handler(handlers, handler) { if (!handler->name || (handler->list && !handler->list(dentry))) continue; |