Stephen Smalley <stephen.smalley.work@xxxxxxxxx> writes: > commit 8b0ba61df5a1 ("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@xxxxxxxxx> > Closes: https://lore.kernel.org/selinux/8734ceal7q.fsf@xxxxxxxxx/ > Reported-by: Paul Eggert <eggert@xxxxxxxxxxx> > Closes: https://bugzilla.redhat.com/show_bug.cgi?id=2369561 > Fixes: 8b0ba61df5a1 ("fs/xattr.c: fix simple_xattr_list to always include security.* xattrs") > > Signed-off-by: Stephen Smalley <stephen.smalley.work@xxxxxxxxx> > --- > fs/xattr.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/fs/xattr.c b/fs/xattr.c > index 8ec5b0204bfd..600ae97969cf 100644 > --- 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)) { Thanks for looking into it and the quick patch. I'll see if I can test it later today. Collin