2016-12-05 03:21:34

by Pan Bian

[permalink] [raw]
Subject: [PATCH 2/2] mtd: ubi: fix improper return value

When __vmalloc() returns a NULL pointer, the data is not really tested,
and we cannot conclude that the data matches. Thus, returning 0 seems
improper. This patch fixes it, returns "-ENOMEM" and removes the
warning.

Signed-off-by: Pan Bian <[email protected]>
---
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 00d7f44..6707277 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -1347,10 +1347,8 @@ static int self_check_write(struct ubi_device *ubi, const void *buf, int pnum,
return 0;

buf1 = __vmalloc(len, GFP_NOFS, PAGE_KERNEL);
- if (!buf1) {
- ubi_err(ubi, "cannot allocate memory to check writes");
- return 0;
- }
+ if (!buf1)
+ return -ENOMEM;

err = mtd_read(ubi->mtd, addr, len, &read, buf1);
if (err && !mtd_is_bitflip(err))
--
1.9.1