niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

UBI: block: Avoid disk size integer overflow

Browse source 
This patch fixes the issue that on very large UBI volumes
UBI block does not work correctly.

Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
This commit is contained in:
Richard Weinberger 2014-05-05 07:11:54 -03:00 • committed by Artem Bityutskiy
parent 0a3d571bb8
commit 4df38926f3
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/mtd/ubi/block.c
View file

@ -378,9 +378,11 @@ int ubiblock_create(struct ubi_volume_info *vi)
{ {
struct ubiblock *dev; struct ubiblock *dev;
struct gendisk *gd; struct gendisk *gd;
int disk_capacity = (vi->size * vi->usable_leb_size) >> 9; u64 disk_capacity = ((u64)vi->size * vi->usable_leb_size) >> 9;
int ret; int ret;
if ((sector_t)disk_capacity != disk_capacity)
return -EFBIG;
/* Check that the volume isn't already handled */ /* Check that the volume isn't already handled */
mutex_lock(&devices_mutex); mutex_lock(&devices_mutex);
if (find_dev_nolock(vi->ubi_num, vi->vol_id)) { if (find_dev_nolock(vi->ubi_num, vi->vol_id)) {
@ -500,8 +502,13 @@ int ubiblock_remove(struct ubi_volume_info *vi)
static int ubiblock_resize(struct ubi_volume_info *vi) static int ubiblock_resize(struct ubi_volume_info *vi)
{ {
struct ubiblock *dev; struct ubiblock *dev;
int disk_capacity = (vi->size * vi->usable_leb_size) >> 9; u64 disk_capacity = ((u64)vi->size * vi->usable_leb_size) >> 9;
if ((sector_t)disk_capacity != disk_capacity) {
ubi_warn("%s: the volume is too big, cannot resize (%d LEBs)",
dev->gd->disk_name, vi->size);
return -EFBIG;
}
/* /*
* Need to lock the device list until we stop using the device, * Need to lock the device list until we stop using the device,
* otherwise the device struct might get released in * otherwise the device struct might get released in