Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7203db97 authored by Wei Yongjun's avatar Wei Yongjun Committed by Artem Bityutskiy
Browse files

UBIFS: fix return code 



Fix to return -ENOMEM in the kmalloc() and d_make_root() error handling
case instead of 0, as done elsewhere in those functions.

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent e71d1a59

fs/ubifs/super.c

+6 −2
Original line number Diff line number Diff line
@@ -1629,8 +1629,10 @@ static int ubifs_remount_rw(struct ubifs_info *c) 
	}



	c->write_reserve_buf = kmalloc(COMPRESSED_DATA_NODE_BUF_SZ, GFP_KERNEL);

	if (!c->write_reserve_buf)

	if (!c->write_reserve_buf) {

		err = -ENOMEM;

		goto out;

	}



	err = ubifs_lpt_init(c, 0, 1);

	if (err)
@@ -2063,8 +2065,10 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent) 
	}



	sb->s_root = d_make_root(root);

	if (!sb->s_root)

	if (!sb->s_root) {

		err = -ENOMEM;

		goto out_umount;

	}



	mutex_unlock(&c->umount_mutex);

	return 0;