* [patch] UBI: fix some use after free bugs
@ 2014-01-29 13:17 Dan Carpenter
2014-01-29 13:29 ` Richard Weinberger
2014-02-04 7:45 ` Artem Bityutskiy
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2014-01-29 13:17 UTC (permalink / raw)
To: Richard Weinberger
Cc: linux-mtd, kernel-janitors, Brian Norris, David Woodhouse,
Artem Bityutskiy
Move the kmem_cache_free() calls down a couple lines.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index ead861307b3c..c5dad652614d 100644
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -463,8 +463,8 @@ static int scan_pool(struct ubi_device *ubi, struct ubi_attach_info *ai,
}
}
if (found_orphan) {
- kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
list_del(&tmp_aeb->u.list);
+ kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
}
new_aeb = kmem_cache_alloc(ai->aeb_slab_cache,
@@ -846,16 +846,16 @@ fail_bad:
ret = UBI_BAD_FASTMAP;
fail:
list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &used, u.list) {
- kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
list_del(&tmp_aeb->u.list);
+ kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
}
list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &eba_orphans, u.list) {
- kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
list_del(&tmp_aeb->u.list);
+ kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
}
list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &free, u.list) {
- kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
list_del(&tmp_aeb->u.list);
+ kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
}
return ret;
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [patch] UBI: fix some use after free bugs
2014-01-29 13:17 [patch] UBI: fix some use after free bugs Dan Carpenter
@ 2014-01-29 13:29 ` Richard Weinberger
2014-02-04 7:45 ` Artem Bityutskiy
1 sibling, 0 replies; 3+ messages in thread
From: Richard Weinberger @ 2014-01-29 13:29 UTC (permalink / raw)
To: Dan Carpenter
Cc: linux-mtd, kernel-janitors, Brian Norris, David Woodhouse,
Artem Bityutskiy
Am 29.01.2014 14:17, schrieb Dan Carpenter:
> Move the kmem_cache_free() calls down a couple lines.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Thanks for fixing this Dan!
Acked-by: Richard Weinberger <richard@nod.at>
> diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
> index ead861307b3c..c5dad652614d 100644
> --- a/drivers/mtd/ubi/fastmap.c
> +++ b/drivers/mtd/ubi/fastmap.c
> @@ -463,8 +463,8 @@ static int scan_pool(struct ubi_device *ubi, struct ubi_attach_info *ai,
> }
> }
> if (found_orphan) {
> - kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
> list_del(&tmp_aeb->u.list);
> + kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
> }
>
> new_aeb = kmem_cache_alloc(ai->aeb_slab_cache,
> @@ -846,16 +846,16 @@ fail_bad:
> ret = UBI_BAD_FASTMAP;
> fail:
> list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &used, u.list) {
> - kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
> list_del(&tmp_aeb->u.list);
> + kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
> }
> list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &eba_orphans, u.list) {
> - kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
> list_del(&tmp_aeb->u.list);
> + kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
> }
> list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &free, u.list) {
> - kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
> list_del(&tmp_aeb->u.list);
> + kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
> }
>
> return ret;
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [patch] UBI: fix some use after free bugs
2014-01-29 13:17 [patch] UBI: fix some use after free bugs Dan Carpenter
2014-01-29 13:29 ` Richard Weinberger
@ 2014-02-04 7:45 ` Artem Bityutskiy
1 sibling, 0 replies; 3+ messages in thread
From: Artem Bityutskiy @ 2014-02-04 7:45 UTC (permalink / raw)
To: Dan Carpenter
Cc: Richard Weinberger, kernel-janitors, Brian Norris,
David Woodhouse, linux-mtd
On Wed, 2014-01-29 at 16:17 +0300, Dan Carpenter wrote:
> Move the kmem_cache_free() calls down a couple lines.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Pushed to linux-ubifs.git, thanks!
I'll send this to Linus for 3.13 inclusion.
--
Best Regards,
Artem Bityutskiy
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-02-04 7:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-29 13:17 [patch] UBI: fix some use after free bugs Dan Carpenter
2014-01-29 13:29 ` Richard Weinberger
2014-02-04 7:45 ` Artem Bityutskiy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).