[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1480907958-19229-1-git-send-email-bianpan2016@163.com>
Date: Mon, 5 Dec 2016 11:19:18 +0800
From: Pan Bian <bianpan2016@....com>
To: Artem Bityutskiy <dedekind1@...il.com>,
Richard Weinberger <richard@....at>,
David Woodhouse <dwmw2@...radead.org>,
Brian Norris <computersforpeace@...il.com>,
Boris Brezillon <boris.brezillon@...e-electrons.com>,
Marek Vasut <marek.vasut@...il.com>,
Cyrille Pitchen <cyrille.pitchen@...el.com>,
linux-mtd@...ts.infradead.org
Cc: linux-kernel@...r.kernel.org, Pan Bian <bianpan2016@....com>
Subject: [PATCH 1/2 v2] mtd: ubi: fix improper return value
When __vmalloc() returns a NULL pointer, the region is not really
checked, and we cannot conclude that only 0xFF bytes are present at
offset. Thus, returing 0 seems improper. This patches fixes it, returns
"-ENOMEM" and removes the warning.
Signed-off-by: Pan Bian <bianpan2016@....com>
---
drivers/mtd/ubi/io.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index b6fb8f9..00d7f44 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -1411,10 +1411,8 @@ int ubi_self_check_all_ff(struct ubi_device *ubi, int pnum, int offset, int len)
return 0;
buf = __vmalloc(len, GFP_NOFS, PAGE_KERNEL);
- if (!buf) {
- ubi_err(ubi, "cannot allocate memory to check for 0xFFs");
- return 0;
- }
+ if (!buf)
+ return -ENOMEM;
err = mtd_read(ubi->mtd, addr, len, &read, buf);
if (err && !mtd_is_bitflip(err)) {
--
1.9.1
Powered by blists - more mailing lists