Unverified Commit 03ef650d authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12658 nilfs2: fix potential null-ptr-deref in nilfs_btree_insert() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhang Kunbo <zhangkunbo@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/4SEM23I56AQ34UUMRVRVFOBVQYCVWWCY/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYPKK 
 
Link:https://gitee.com/openeuler/kernel/pulls/12658

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents dd58efc1 3d8b4236

fs/nilfs2/btree.c

+2 −1
Original line number Diff line number Diff line
@@ -381,7 +381,8 @@ static int nilfs_btree_root_broken(const struct nilfs_btree_node *node, 
	if (unlikely(level < NILFS_BTREE_LEVEL_NODE_MIN ||

		     level >= NILFS_BTREE_LEVEL_MAX ||

		     nchildren < 0 ||

		     nchildren > NILFS_BTREE_ROOT_NCHILDREN_MAX)) {

		     nchildren > NILFS_BTREE_ROOT_NCHILDREN_MAX ||

		     (nchildren == 0 && level > NILFS_BTREE_LEVEL_NODE_MIN))) {

		nilfs_crit(inode->i_sb,

			   "bad btree root (ino=%lu): level = %d, flags = 0x%x, nchildren = %d",

			   inode->i_ino, level, flags, nchildren);