Commit 40b6e61a authored by Boris Brezillon's avatar Boris Brezillon Committed by Richard Weinberger

ubi: fastmap: Fix add_vol() return value test in ubi_attach_fastmap()

Commit e96a8a3b ("UBI: Fastmap: Do not add vol if it already
exists") introduced a bug by changing the possible error codes returned
by add_vol():
- this function 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 on add_vol() return val to match this new behavior.

Fixes: e96a8a3b ("UBI: Fastmap: Do not add vol if it already exists")
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: default avatarSheng Yong <shengyong1@huawei.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 14970f20
...@@ -707,11 +707,11 @@ static int ubi_attach_fastmap(struct ubi_device *ubi, ...@@ -707,11 +707,11 @@ static int ubi_attach_fastmap(struct ubi_device *ubi,
fmvhdr->vol_type, fmvhdr->vol_type,
be32_to_cpu(fmvhdr->last_eb_bytes)); be32_to_cpu(fmvhdr->last_eb_bytes));
if (!av) if (IS_ERR(av)) {
goto fail_bad; if (PTR_ERR(av) == -EEXIST)
if (PTR_ERR(av) == -EINVAL) { ubi_err(ubi, "volume (ID %i) already exists",
ubi_err(ubi, "volume (ID %i) already exists", fmvhdr->vol_id);
fmvhdr->vol_id);
goto fail_bad; goto fail_bad;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment