In-Reply-To: <a9e22dff1002220840x7e86a1a0i3d44cefc1c6a79c0@mail.gmail.com>
References: <a9e22dff1002220826p63209a33n27e84ea10e191a19@mail.gmail.com> <a9e22dff1002220840x7e86a1a0i3d44cefc1c6a79c0@mail.gmail.com>
Subject: Re: [PATCH] jffs2: fix memory leak if the sector was successfully erased
To: niam <niam.niam@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>, Joe Perches <joe@perches.com>,
       linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org
Message-ID: <OFB51E93AB.187F855F-ONC12576D2.00618F62-C12576D2.0061DEB5@transmode.se>
From: Joakim Tjernlund <joakim.tjernlund@transmode.se>
Date: Mon, 22 Feb 2010 18:49:00 +0100
MIME-Version: 1.0
Content-type: text/plain; charset=ISO-8859-15
Content-transfer-encoding: 8BIT
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1201
Lines: 39

niam <niam.niam@gmail.com> wrote on 2010/02/22 17:40:11:
>
> Resending patch to proper people/mailing list.
>
> Memory allocated for erase instruction is not freed if the sector was
> successfully erased.

NAK, jffs2_erase_callback() will free it so
you have added a double free I think. Did you measure a memory leak?

>
> Signed-off-by: Dmytro Milinevskyy <niam.niam@gmail.com>
> ---
> ?fs/jffs2/erase.c | ? ?4 +++-
> ?1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
> index b47679b..c0a5604 100644
> --- a/fs/jffs2/erase.c
> +++ b/fs/jffs2/erase.c
> @@ -74,8 +74,10 @@ static void jffs2_erase_block(struct jffs2_sb_info *c,
> ? ? ? ?((struct erase_priv_struct *)instr->priv)->c = c;
>
> ? ? ? ?ret = c->mtd->erase(c->mtd, instr);
> - ? ? ? if (!ret)
> + ? ? ? if (!ret) {
> + ? ? ? ?kfree(instr);
> ? ? ? ? ? ? ? ?return;
> + ? ?}
>
> ? ? ? ?bad_offset = instr->fail_addr;
> ? ? ? ?kfree(instr);
>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/