[PATCH] UBI: block: fix dereference on uninitialized dev

[PATCH] UBI: block: fix dereference on uninitialized dev

[Colin King]

From: Colin Ian King <colin.king@canonical.com>

commit 4df38926f337 ("UBI: block: Avoid disk size integer overflow")
introduced a dereference on dev (which is not initialized at that
point) when printing a warning message.  Remove the reference to
the dev's disk_name.

Found by cppcheck:
 [drivers/mtd/ubi/block.c:509]: (error) Uninitialized variable: dev

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/mtd/ubi/block.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
index 33c6495..944bdbd 100644
--- a/drivers/mtd/ubi/block.c
+++ b/drivers/mtd/ubi/block.c
@@ -505,8 +505,8 @@ static int ubiblock_resize(struct ubi_volume_info *vi)
 	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);
+		ubi_warn("block: the volume is too big, cannot resize (%d LEBs)",
+			vi->size);
 		return -EFBIG;
 	}
 	/*
-- 
2.1.0.rc1

Re: [PATCH] UBI: block: fix dereference on uninitialized dev

[Ezequiel Garcia]

Hi Colin,

Thanks for the fix.

On 16 Aug 05:49 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> commit 4df38926f337 ("UBI: block: Avoid disk size integer overflow")
> introduced a dereference on dev (which is not initialized at that
> point) when printing a warning message.  Remove the reference to
> the dev's disk_name.
> 
> Found by cppcheck:
>  [drivers/mtd/ubi/block.c:509]: (error) Uninitialized variable: dev
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  drivers/mtd/ubi/block.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
> index 33c6495..944bdbd 100644
> --- a/drivers/mtd/ubi/block.c
> +++ b/drivers/mtd/ubi/block.c
> @@ -505,8 +505,8 @@ static int ubiblock_resize(struct ubi_volume_info *vi)
>  	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);
> +		ubi_warn("block: the volume is too big, cannot resize (%d LEBs)",
> +			vi->size);

Do you think you can resend this adding the name of the volume to the warning?

>  		return -EFBIG;
>  	}

-- 
Ezequiel García, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com