Commit 7aa17992 authored by ZhaoLong Wang's avatar ZhaoLong Wang
Browse files

Revert "ubi: ensure that VID header offset + VID header size <= alloc, size" 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8W70M


CVE: NA

---------------------------------------------

This reverts commit 45853252.

Signed-off-by: default avatarZhaoLong Wang <wangzhaolong1@huawei.com>
parent 2f6f863e

drivers/mtd/ubi/build.c

+0 −6
Original line number Diff line number Diff line
@@ -667,12 +667,6 @@ static int io_init(struct ubi_device *ubi, int max_beb_per1024) 
	ubi->ec_hdr_alsize = ALIGN(UBI_EC_HDR_SIZE, ubi->hdrs_min_io_size);

	ubi->vid_hdr_alsize = ALIGN(UBI_VID_HDR_SIZE, ubi->hdrs_min_io_size);



	if (ubi->vid_hdr_offset && ((ubi->vid_hdr_offset + UBI_VID_HDR_SIZE) >

	    ubi->vid_hdr_alsize)) {

		ubi_err(ubi, "VID header offset %d too large.", ubi->vid_hdr_offset);

		return -EINVAL;

	}



	dbg_gen("min_io_size      %d", ubi->min_io_size);

	dbg_gen("max_write_size   %d", ubi->max_write_size);

	dbg_gen("hdrs_min_io_size %d", ubi->hdrs_min_io_size);