Commit 0312017c authored by Artem Savkov's avatar Artem Savkov Committed by Greg Kroah-Hartman

Make __xfs_xattr_put_listen preperly report errors.

commit 791cc43b upstream.

Commit 2a6fba6d "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: default avatarArtem Savkov <asavkov@redhat.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
Cc: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8523011c
...@@ -147,6 +147,7 @@ __xfs_xattr_put_listent( ...@@ -147,6 +147,7 @@ __xfs_xattr_put_listent(
arraytop = context->count + prefix_len + namelen + 1; arraytop = context->count + prefix_len + namelen + 1;
if (arraytop > context->firstu) { if (arraytop > context->firstu) {
context->count = -1; /* insufficient space */ context->count = -1; /* insufficient space */
context->seen_enough = 1;
return 0; return 0;
} }
offset = (char *)context->alist + context->count; offset = (char *)context->alist + context->count;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment