# git rev-parse -q --verify 5e46d1b78a03d52306f21f77a4e4a144b6d31486^{commit} 5e46d1b78a03d52306f21f77a4e4a144b6d31486 already have revision, skipping fetch # git checkout -q -f -B kisskb 5e46d1b78a03d52306f21f77a4e4a144b6d31486 # git clean -qxdf # < git log -1 # commit 5e46d1b78a03d52306f21f77a4e4a144b6d31486 # Author: Tetsuo Handa # Date: Sun Mar 21 23:37:49 2021 +0900 # # reiserfs: update reiserfs_xattrs_initialized() condition # # syzbot is reporting NULL pointer dereference at reiserfs_security_init() # [1], for commit ab17c4f02156c4f7 ("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 6cb4aff0a77cc0e6 ("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: syzbot # Signed-off-by: Tetsuo Handa # Fixes: 6cb4aff0a77c ("reiserfs: fix oops while creating privroot with selinux enabled") # Acked-by: Jeff Mahoney # Acked-by: Jan Kara # Signed-off-by: Linus Torvalds # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux-ld --version # < git log --format=%s --max-count=1 5e46d1b78a03d52306f21f77a4e4a144b6d31486 # < make -s -j 8 ARCH=s390 O=/kisskb/build/linus_s390-allyesconfig_s390x-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux- allyesconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # < make -s -j 8 ARCH=s390 O=/kisskb/build/linus_s390-allyesconfig_s390x-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux- help # make -s -j 8 ARCH=s390 O=/kisskb/build/linus_s390-allyesconfig_s390x-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux- olddefconfig # make -s -j 8 ARCH=s390 O=/kisskb/build/linus_s390-allyesconfig_s390x-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux- /kisskb/src/drivers/gpu/drm/rockchip/cdn-dp-core.c:1124:12: warning: 'cdn_dp_resume' defined but not used [-Wunused-function] static int cdn_dp_resume(struct device *dev) ^~~~~~~~~~~~~ In file included from /kisskb/src/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c:42: /kisskb/src/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c: In function 'mvpp2_setup_bm_pool': /kisskb/src/drivers/net/ethernet/marvell/mvpp2/mvpp2.h:844:2: warning: overflow in conversion from 'long unsigned int' to 'int' changes value from '18446744073709551584' to '-32' [-Woverflow] ((total_size) - MVPP2_SKB_HEADROOM - MVPP2_SKB_SHINFO_SIZE) ^ /kisskb/src/drivers/net/ethernet/marvell/mvpp2/mvpp2.h:948:33: note: in expansion of macro 'MVPP2_RX_MAX_PKT_SIZE' #define MVPP2_BM_SHORT_PKT_SIZE MVPP2_RX_MAX_PKT_SIZE(MVPP2_BM_SHORT_FRAME_SIZE) ^~~~~~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c:683:41: note: in expansion of macro 'MVPP2_BM_SHORT_PKT_SIZE' mvpp2_pools[MVPP2_BM_SHORT].pkt_size = MVPP2_BM_SHORT_PKT_SIZE; ^~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/lib/bitfield_kunit.c: In function 'test_bitfields_constants': /kisskb/src/lib/bitfield_kunit.c:93:1: warning: the frame size of 7424 bytes is larger than 2048 bytes [-Wframe-larger-than=] } ^ /kisskb/src/drivers/input/joystick/analog.c:160:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp] #warning Precise timer not defined for this architecture. ^~~~~~~ Completed OK # rm -rf /kisskb/build/linus_s390-allyesconfig_s390x-gcc8 # Build took: 0:33:08.656232