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

!6247 ubi: Check for too small LEB size in VTBL code 

Merge Pull Request from: @ci-robot 
 
PR sync from: ZhaoLong Wang <wangzhaolong1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/3ZETWUEOLS7MKARDBO6RVQASVRA5GZXD/ 
 
https://gitee.com/src-openeuler/kernel/issues/I91L79 
 
Link:https://gitee.com/openeuler/kernel/pulls/6247

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 379c369c 0b890629

drivers/mtd/ubi/vtbl.c

+6 −0
Original line number Diff line number Diff line
@@ -791,6 +791,12 @@ int ubi_read_volume_table(struct ubi_device *ubi, struct ubi_attach_info *ai) 
	 * The number of supported volumes is limited by the eraseblock size

	 * and by the UBI_MAX_VOLUMES constant.

	 */



	if (ubi->leb_size < UBI_VTBL_RECORD_SIZE) {

		ubi_err(ubi, "LEB size too small for a volume record");

		return -EINVAL;

	}



	ubi->vtbl_slots = ubi->leb_size / UBI_VTBL_RECORD_SIZE;

	if (ubi->vtbl_slots > UBI_MAX_VOLUMES)

		ubi->vtbl_slots = UBI_MAX_VOLUMES;