Commit 8bbf266e authored by Jann Horn's avatar Jann Horn Committed by Kleber Sacilotto de Souza

reiserfs: fix broken xattr handling (heap corruption, bad retval)

BugLink: https://bugs.launchpad.net/bugs/1792377

commit a13f085d 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: 48b32a35 ("reiserfs: use generic xattr handlers")
Signed-off-by: default avatarJann Horn <jannh@google.com>
Acked-by: default avatarJeff 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent 0a5bef6d
...@@ -791,8 +791,10 @@ static int listxattr_filler(struct dir_context *ctx, const char *name, ...@@ -791,8 +791,10 @@ static int listxattr_filler(struct dir_context *ctx, const char *name,
size = handler->list(handler, b->dentry, size = handler->list(handler, b->dentry,
b->buf + b->pos, b->size, name, b->buf + b->pos, b->size, name,
namelen); namelen);
if (size > b->size) if (b->pos + size > b->size) {
b->pos = -ERANGE;
return -ERANGE; return -ERANGE;
}
} else { } else {
size = handler->list(handler, b->dentry, size = handler->list(handler, b->dentry,
NULL, 0, name, namelen); NULL, 0, name, namelen);
......
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