fs/xattr.c: fix simple_xattr_list()

stephensmalley · brauner · commit 800d0b9b6a8b · 2025-06-06T10:00:17.000+02:00
commit 8b0ba61 ("fs/xattr.c: fix simple_xattr_list to always include security.* xattrs") failed to reset err after the call to security_inode_listsecurity(), which returns the length of the returned xattr name. This results in simple_xattr_list() incorrectly returning this length even if a POSIX acl is also set on the inode. Reported-by: Collin Funk <collin.funk1@gmail.com> Closes: https://lore.kernel.org/selinux/8734ceal7q.fsf@gmail.com/ Reported-by: Paul Eggert <eggert@cs.ucla.edu> Closes: https://bugzilla.redhat.com/show_bug.cgi?id=2369561 Fixes: 8b0ba61 ("fs/xattr.c: fix simple_xattr_list to always include security.* xattrs") Signed-off-by: Stephen Smalley <stephen.smalley.work@gmail.com> Link: https://lore.kernel.org/20250605165116.2063-1-stephen.smalley.work@gmail.com Signed-off-by: Christian Brauner <brauner@kernel.org>
diff --git a/fs/xattr.c b/fs/xattr.c
@@ -1479,6 +1479,7 @@ ssize_t simple_xattr_list(struct inode *inode, struct simple_xattrs *xattrs,
 		buffer += err;
 	}
 	remaining_size -= err;
+	err = 0;
 
 	read_lock(&xattrs->lock);
 	for (rbp = rb_first(&xattrs->rb_root); rbp; rbp = rb_next(rbp)) {

Original file line number	Diff line number	Diff line change
`@@ -1479,6 +1479,7 @@ ssize_t simple_xattr_list(struct inode inode, struct simple_xattrs xattrs,`
`1479`	`1479`	`buffer += err;`
`1480`	`1480`	`}`
`1481`	`1481`	`remaining_size -= err;`
	`1482`	`+ err = 0;`
`1482`	`1483`
`1483`	`1484`	`read_lock(&xattrs->lock);`
`1484`	`1485`	`for (rbp = rb_first(&xattrs->rb_root); rbp; rbp = rb_next(rbp)) {`