[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CACQ1gAiAO5JB0vEW1pS=qWrUUjfPkOhp_5RdNMK0bm3-A1Bwbg@mail.gmail.com>
Date: Mon, 30 Sep 2013 10:13:46 +0200
From: Richard Genoud <richard.genoud@...il.com>
To: Richard Weinberger <richard@....at>
Cc: Artem Bityutskiy <dedekind1@...il.com>,
linux-mtd <linux-mtd@...ts.infradead.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 6/7] UBI: Fix memory leak in ubi_attach_fastmap() error path
2013/9/28 Richard Weinberger <richard@....at>:
> On error we have to free all three temporary lists.
>
> Reported-by: Richard Genoud <richard.genoud@...il.com>
> Signed-off-by: Richard Weinberger <richard@....at>
> ---
> drivers/mtd/ubi/fastmap.c | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
>
> diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
> index 05067f5..4cfc8da 100644
> --- a/drivers/mtd/ubi/fastmap.c
> +++ b/drivers/mtd/ubi/fastmap.c
> @@ -841,6 +841,19 @@ static int ubi_attach_fastmap(struct ubi_device *ubi,
> 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);
> + }
> + 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);
> + }
> + 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);
> + }
> +
> return ret;
> }
>
> --
> 1.8.3.1
>
Works like a charm !
Tested-by: Richard Genoud <richard.genoud@...il.com>
Thanks !
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists