Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1510972

[PATCH] UBI: fastmap: Fix add_vol() return value test in ubi_attach_fastmap()

Show all headers | View raw

Commit e96a8a3bb671 ("UBI: Fastmap: Do not add vol if it already
exists") introduced a bug by changing the possible error codes returned
by add_vol():
- this functions no longer returns NULL in case of allocation failure
  but return ERR_PTR(-ENOMEM)
- when a duplicate entry in the volume RB tree is found it returns
  ERR_PTR(-EEXIST) instead of ERR_PTR(-EINVAL)

Fix the tests done of add_vol() return value accordingly.

Fixes: e96a8a3bb671 ("UBI: Fastmap: Do not add vol if it already exists")
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Sheng Yong <shengyong1@huawei.com>
---
 drivers/mtd/ubi/fastmap.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index d6384d965788..eb39c44726e3 100644
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -707,11 +707,11 @@ static int ubi_attach_fastmap(struct ubi_device *ubi,
 			     fmvhdr->vol_type,
 			     be32_to_cpu(fmvhdr->last_eb_bytes));
 
-		if (!av)
-			goto fail_bad;
-		if (PTR_ERR(av) == -EINVAL) {
-			ubi_err(ubi, "volume (ID %i) already exists",
-				fmvhdr->vol_id);
+		if (IS_ERR(av)) {
+			if (PTR_ERR(av) == -EEXIST)
+				ubi_err(ubi, "volume (ID %i) already exists",
+					fmvhdr->vol_id);
+
 			goto fail_bad;
 		}
 
-- 
2.7.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] UBI: fastmap: Fix add_vol() return value test in ubi_attach_fastmap() Boris Brezillon <boris.brezillon@free-electrons.com> - 2016-10-28 11:10 +0200
  Re: [PATCH] UBI: fastmap: Fix add_vol() return value test in  ubi_attach_fastmap() Boris Brezillon <boris.brezillon@free-electrons.com> - 2016-10-28 11:20 +0200
    Re: [PATCH] UBI: fastmap: Fix add_vol() return value test in  ubi_attach_fastmap() Richard Weinberger <richard@nod.at> - 2016-10-28 11:20 +0200

csiph-web