Commit 5e46d1b7 authored by Tetsuo Handa's avatar Tetsuo Handa Committed by Linus Torvalds

reiserfs: update reiserfs_xattrs_initialized() condition

syzbot is reporting NULL pointer dereference at reiserfs_security_init()
[1], for commit ab17c4f0 ("reiserfs: fixup xattr_root caching")
is assuming that REISERFS_SB(s)->xattr_root != NULL in
reiserfs_xattr_jcreate_nblocks() despite that commit made
REISERFS_SB(sb)->priv_root != NULL && REISERFS_SB(s)->xattr_root == NULL
case possible.

I guess that commit 6cb4aff0 ("reiserfs: fix oops while creating
privroot with selinux enabled") wanted to check xattr_root != NULL
before reiserfs_xattr_jcreate_nblocks(), for the changelog is talking
about the xattr root.

  The issue is that while creating the privroot during mount
  reiserfs_security_init calls reiserfs_xattr_jcreate_nblocks which
  dereferences the xattr root. The xattr root doesn't exist, so we get
  an oops.

Therefore, update reiserfs_xattrs_initialized() to check both the
privroot and the xattr root.

Link: https://syzkaller.appspot.com/bug?id=8abaedbdeb32c861dc5340544284167dd0e46cde # [1]
Reported-and-tested-by: default avatarsyzbot <syzbot+690cb1e51970435f9775@syzkaller.appspotmail.com>
Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Fixes: 6cb4aff0 ("reiserfs: fix oops while creating privroot with selinux enabled")
Acked-by: default avatarJeff Mahoney <jeffm@suse.com>
Acked-by: default avatarJan Kara <jack@suse.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6ac86aae
...@@ -44,7 +44,7 @@ void reiserfs_security_free(struct reiserfs_security_handle *sec); ...@@ -44,7 +44,7 @@ void reiserfs_security_free(struct reiserfs_security_handle *sec);
static inline int reiserfs_xattrs_initialized(struct super_block *sb) static inline int reiserfs_xattrs_initialized(struct super_block *sb)
{ {
return REISERFS_SB(sb)->priv_root != NULL; return REISERFS_SB(sb)->priv_root && REISERFS_SB(sb)->xattr_root;
} }
#define xattr_size(size) ((size) + sizeof(struct reiserfs_xattr_header)) #define xattr_size(size) ((size) + sizeof(struct reiserfs_xattr_header))
......
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