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

Commit 9a5f09ac authored by Boris Brezillon's avatar Boris Brezillon Committed by Richard Weinberger
Browse files

UBI: add an helper to check lnum validity 



ubi_leb_valid() is here to replace the
lnum < 0 || lnum >= vol->reserved_pebs checks.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 2d78aee4

drivers/mtd/ubi/cdev.c

+2 −2
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ static long vol_cdev_ioctl(struct file *file, unsigned int cmd, 


		/* Validate the request */

		err = -EINVAL;

		if (req.lnum < 0 || req.lnum >= vol->reserved_pebs ||

		if (!ubi_leb_valid(vol, req.lnum) ||

		    req.bytes < 0 || req.bytes > vol->usable_leb_size)

			break;
@@ -485,7 +485,7 @@ static long vol_cdev_ioctl(struct file *file, unsigned int cmd, 
			break;

		}



		if (lnum < 0 || lnum >= vol->reserved_pebs) {

		if (!ubi_leb_valid(vol, lnum)) {

			err = -EINVAL;

			break;

		}

drivers/mtd/ubi/kapi.c

+6 −6
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ int ubi_leb_write(struct ubi_volume_desc *desc, int lnum, const void *buf, 
	if (desc->mode == UBI_READONLY || vol->vol_type == UBI_STATIC_VOLUME)

		return -EROFS;



	if (lnum < 0 || lnum >= vol->reserved_pebs || offset < 0 || len < 0 ||

	if (!ubi_leb_valid(vol, lnum) || offset < 0 || len < 0 ||

	    offset + len > vol->usable_leb_size ||

	    offset & (ubi->min_io_size - 1) || len & (ubi->min_io_size - 1))

		return -EINVAL;
@@ -583,7 +583,7 @@ int ubi_leb_change(struct ubi_volume_desc *desc, int lnum, const void *buf, 
	if (desc->mode == UBI_READONLY || vol->vol_type == UBI_STATIC_VOLUME)

		return -EROFS;



	if (lnum < 0 || lnum >= vol->reserved_pebs || len < 0 ||

	if (!ubi_leb_valid(vol, lnum) || len < 0 ||

	    len > vol->usable_leb_size || len & (ubi->min_io_size - 1))

		return -EINVAL;
@@ -620,7 +620,7 @@ int ubi_leb_erase(struct ubi_volume_desc *desc, int lnum) 
	if (desc->mode == UBI_READONLY || vol->vol_type == UBI_STATIC_VOLUME)

		return -EROFS;



	if (lnum < 0 || lnum >= vol->reserved_pebs)

	if (!ubi_leb_valid(vol, lnum))

		return -EINVAL;



	if (vol->upd_marker)
@@ -680,7 +680,7 @@ int ubi_leb_unmap(struct ubi_volume_desc *desc, int lnum) 
	if (desc->mode == UBI_READONLY || vol->vol_type == UBI_STATIC_VOLUME)

		return -EROFS;



	if (lnum < 0 || lnum >= vol->reserved_pebs)

	if (!ubi_leb_valid(vol, lnum))

		return -EINVAL;



	if (vol->upd_marker)
@@ -716,7 +716,7 @@ int ubi_leb_map(struct ubi_volume_desc *desc, int lnum) 
	if (desc->mode == UBI_READONLY || vol->vol_type == UBI_STATIC_VOLUME)

		return -EROFS;



	if (lnum < 0 || lnum >= vol->reserved_pebs)

	if (!ubi_leb_valid(vol, lnum))

		return -EINVAL;



	if (vol->upd_marker)
@@ -751,7 +751,7 @@ int ubi_is_mapped(struct ubi_volume_desc *desc, int lnum) 


	dbg_gen("test LEB %d:%d", vol->vol_id, lnum);



	if (lnum < 0 || lnum >= vol->reserved_pebs)

	if (!ubi_leb_valid(vol, lnum))

		return -EINVAL;



	if (vol->upd_marker)

drivers/mtd/ubi/ubi.h

+5 −0
Original line number Diff line number Diff line
@@ -843,6 +843,11 @@ void ubi_update_reserved(struct ubi_device *ubi); 
void ubi_calculate_reserved(struct ubi_device *ubi);

int ubi_check_pattern(const void *buf, uint8_t patt, int size);



static inline bool ubi_leb_valid(struct ubi_volume *vol, int lnum)

{

	return lnum >= 0 && lnum < vol->reserved_pebs;

}



/* eba.c */

int ubi_eba_unmap_leb(struct ubi_device *ubi, struct ubi_volume *vol,

		      int lnum);