* [PATCH] UBI: fastmap: Fix add_vol() return value test in ubi_attach_fastmap()
@ 2016-10-28 9:08 Boris Brezillon
2016-10-28 9:12 ` Boris Brezillon
0 siblings, 1 reply; 3+ messages in thread
From: Boris Brezillon @ 2016-10-28 9:08 UTC (permalink / raw)
To: Artem Bityutskiy, Richard Weinberger
Cc: David Woodhouse, Brian Norris, linux-mtd, linux-kernel,
Boris Brezillon
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] UBI: fastmap: Fix add_vol() return value test in ubi_attach_fastmap()
2016-10-28 9:08 [PATCH] UBI: fastmap: Fix add_vol() return value test in ubi_attach_fastmap() Boris Brezillon
@ 2016-10-28 9:12 ` Boris Brezillon
2016-10-28 9:14 ` Richard Weinberger
0 siblings, 1 reply; 3+ messages in thread
From: Boris Brezillon @ 2016-10-28 9:12 UTC (permalink / raw)
To: Artem Bityutskiy, Richard Weinberger
Cc: David Woodhouse, Brian Norris, linux-mtd, linux-kernel
On Fri, 28 Oct 2016 11:08:44 +0200
Boris Brezillon <boris.brezillon@free-electrons.com> wrote:
> 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
^ function
> 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.
"Fix the tests done on add_vol() return val to match this new behavior."
Do you want me to send a new version fixing the commit message?
>
> 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;
> }
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] UBI: fastmap: Fix add_vol() return value test in ubi_attach_fastmap()
2016-10-28 9:12 ` Boris Brezillon
@ 2016-10-28 9:14 ` Richard Weinberger
0 siblings, 0 replies; 3+ messages in thread
From: Richard Weinberger @ 2016-10-28 9:14 UTC (permalink / raw)
To: Boris Brezillon, Artem Bityutskiy
Cc: David Woodhouse, Brian Norris, linux-mtd, linux-kernel
On 28.10.2016 11:12, Boris Brezillon wrote:
> On Fri, 28 Oct 2016 11:08:44 +0200
> Boris Brezillon <boris.brezillon@free-electrons.com> wrote:
>
>> 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
>
> ^ function
>
>> 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.
>
> "Fix the tests done on add_vol() return val to match this new behavior."
>
> Do you want me to send a new version fixing the commit message?
Nope, I can fixup it myself. :-)
Thanks,
//richard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-10-28 9:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-28 9:08 [PATCH] UBI: fastmap: Fix add_vol() return value test in ubi_attach_fastmap() Boris Brezillon
2016-10-28 9:12 ` Boris Brezillon
2016-10-28 9:14 ` Richard Weinberger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox