Skip to content

Commit bc5f31d

Browse files
sm00thgregkh
authored andcommitted
Make __xfs_xattr_put_listen preperly report errors.
commit 791cc43b36eb1f88166c8505900cad1b43c7fe1a upstream. Commit 2a6fba6 "xfs: only return -errno or success from attr ->put_listent" changes the returnvalue of __xfs_xattr_put_listen to 0 in case when there is insufficient space in the buffer assuming that setting context->count to -1 would be enough, but all of the ->put_listent callers only check seen_enough. This results in a failed assertion: XFS: Assertion failed: context->count >= 0, file: fs/xfs/xfs_xattr.c, line: 175 in insufficient buffer size case. This is only reproducible with at least 2 xattrs and only when the buffer gets depleted before the last one. Furthermore if buffersize is such that it is enough to hold the last xattr's name, but not enough to hold the sum of preceeding xattr names listxattr won't fail with ERANGE, but will suceed returning last xattr's name without the first character. The first character end's up overwriting data stored at (context->alist - 1). Signed-off-by: Artem Savkov <asavkov@redhat.com> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com> Cc: Nikolay Borisov <nborisov@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent e8a1086 commit bc5f31d

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

fs/xfs/xfs_xattr.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ xfs_xattr_put_listent(
180180
arraytop = context->count + prefix_len + namelen + 1;
181181
if (arraytop > context->firstu) {
182182
context->count = -1; /* insufficient space */
183+
context->seen_enough = 1;
183184
return 0;
184185
}
185186
offset = (char *)context->alist + context->count;

0 commit comments

Comments
 (0)