Skip to content

Commit ef3cf94

Browse files
thejhgregkh
authored andcommitted
reiserfs: fix broken xattr handling (heap corruption, bad retval)
commit a13f085 upstream. This fixes the following issues: - When a buffer size is supplied to reiserfs_listxattr() such that each individual name fits, but the concatenation of all names doesn't fit, reiserfs_listxattr() overflows the supplied buffer. This leads to a kernel heap overflow (verified using KASAN) followed by an out-of-bounds usercopy and is therefore a security bug. - When a buffer size is supplied to reiserfs_listxattr() such that a name doesn't fit, -ERANGE should be returned. But reiserfs instead just truncates the list of names; I have verified that if the only xattr on a file has a longer name than the supplied buffer length, listxattr() incorrectly returns zero. With my patch applied, -ERANGE is returned in both cases and the memory corruption doesn't happen anymore. Credit for making me clean this code up a bit goes to Al Viro, who pointed out that the ->actor calling convention is suboptimal and should be changed. Link: http://lkml.kernel.org/r/20180802151539.5373-1-jannh@google.com Fixes: 48b32a3 ("reiserfs: use generic xattr handlers") Signed-off-by: Jann Horn <jannh@google.com> Acked-by: Jeff Mahoney <jeffm@suse.com> Cc: Eric Biggers <ebiggers@google.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 82c6d49 commit ef3cf94

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

fs/reiserfs/xattr.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -792,8 +792,10 @@ static int listxattr_filler(struct dir_context *ctx, const char *name,
792792
return 0;
793793
size = namelen + 1;
794794
if (b->buf) {
795-
if (size > b->size)
795+
if (b->pos + size > b->size) {
796+
b->pos = -ERANGE;
796797
return -ERANGE;
798+
}
797799
memcpy(b->buf + b->pos, name, namelen);
798800
b->buf[b->pos + namelen] = 0;
799801
}

0 commit comments

Comments
 (0)