Unverified Commit 3a7bb21b authored by Jeff Layton's avatar Jeff Layton Committed by Christian Brauner
Browse files

fs: don't call posix_acl_listxattr in generic_listxattr 



Commit f2620f16 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: f2620f16 xattr: simplify listxattr helpers
Reported-by: default avatarOndrej Valousek <ondrej.valousek.xm@renesas.com>
Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Message-Id: <20230516124655.82283-1-jlayton@kernel.org>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent f15afbd3

fs/xattr.c

+9 −6
Original line number Diff line number Diff line
@@ -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;