]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
ubi: fastmap: Fix add_vol() return value test in ubi_attach_fastmap()
authorBoris Brezillon <boris.brezillon@free-electrons.com>
Fri, 28 Oct 2016 09:08:44 +0000 (11:08 +0200)
committerRichard Weinberger <richard@nod.at>
Fri, 28 Oct 2016 12:48:18 +0000 (14:48 +0200)
commit40b6e61ac72e99672e47cdb99c8d7d226004169b
tree5c645b21a18ac218b16e70a2f22e3ccd7354cc1b
parent14970f204b1993af7459d5bd34aaff38dfee6670
ubi: fastmap: Fix add_vol() return value test in ubi_attach_fastmap()

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 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: e96a8a3bb671 ("UBI: Fastmap: Do not add vol if it already exists")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Sheng Yong <shengyong1@huawei.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
drivers/mtd/ubi/fastmap.c