Re: [PATCH 1/1] mtd: ubi: fix improper return value

Marek Vasut
2016-12-04T15:37:59Z

On 12/04/2016 07:12 AM, Pan Bian wrote:
> From: Pan Bian <bianpan2016@163.com>
>
> When __vmalloc() returns a NULL pointer, the region is not checked, and
> we cannot make sure that only 0xFF bytes are present at offset. Thus,
> returning 0 seems improper.
>
> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=189081
>
> Signed-off-by: Pan Bian <bianpan2016@163.com>
> ---
> drivers/mtd/ubi/io.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
> index b6fb8f9..b54fe05 100644
> --- a/drivers/mtd/ubi/io.c
> +++ b/drivers/mtd/ubi/io.c
> @@ -1413,7 +1413,7 @@ int ubi_self_check_all_ff(struct ubi_device *ubi, int pnum, int offset, int len)
> buf = __vmalloc(len, GFP_NOFS, PAGE_KERNEL);
> if (!buf) {
> ubi_err(ubi, "cannot allocate memory to check for 0xFFs");
> - return 0;
> + return -ENOMEM;

I wonder if you shouldn't also nuke the ubi_err() , because when you run
out of memory, printk() will likely also fail.

> }
>
> err = mtd_read(ubi->mtd, addr, len, &read, buf);
>

--
Best regards,
Marek Vasut