* [PATCH] jffs2: fix memory leak if the sector was successfully erased @ 2010-02-22 16:26 Ni@m 2010-02-22 16:33 ` Russell King - ARM Linux 2010-02-22 16:35 ` Daniel Mack 0 siblings, 2 replies; 5+ messages in thread From: Ni@m @ 2010-02-22 16:26 UTC (permalink / raw) To: linux-arm-kernel Memory allocated for erase instruction is not freed if the sector was successfully erased. 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); ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] jffs2: fix memory leak if the sector was successfully erased 2010-02-22 16:26 [PATCH] jffs2: fix memory leak if the sector was successfully erased Ni@m @ 2010-02-22 16:33 ` Russell King - ARM Linux 2010-02-22 16:35 ` Daniel Mack 1 sibling, 0 replies; 5+ messages in thread From: Russell King - ARM Linux @ 2010-02-22 16:33 UTC (permalink / raw) To: linux-arm-kernel On Mon, Feb 22, 2010 at 06:26:22PM +0200, Ni at m wrote: > Memory allocated for erase instruction is not freed if the sector was > successfully erased. I can not help you. Please direct your message to the jffs2 developers. ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] jffs2: fix memory leak if the sector was successfully erased 2010-02-22 16:26 [PATCH] jffs2: fix memory leak if the sector was successfully erased Ni@m 2010-02-22 16:33 ` Russell King - ARM Linux @ 2010-02-22 16:35 ` Daniel Mack 2010-02-22 17:28 ` Michael Trimarchi 1 sibling, 1 reply; 5+ messages in thread From: Daniel Mack @ 2010-02-22 16:35 UTC (permalink / raw) To: linux-arm-kernel On Mon, Feb 22, 2010 at 06:26:22PM +0200, Ni at m wrote: > Memory allocated for erase instruction is not freed if the sector was > successfully erased. > > Signed-off-by: Dmytro Milinevskyy <niam.niam@gmail.com> Can you forward that to the right people please? Call scripts/get_maintainer.pl to get a list of maintainers. Daniel > --- > 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); > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] jffs2: fix memory leak if the sector was successfully erased 2010-02-22 16:35 ` Daniel Mack @ 2010-02-22 17:28 ` Michael Trimarchi 2010-02-22 17:40 ` niam 0 siblings, 1 reply; 5+ messages in thread From: Michael Trimarchi @ 2010-02-22 17:28 UTC (permalink / raw) To: linux-arm-kernel Hi, Daniel Mack wrote: > On Mon, Feb 22, 2010 at 06:26:22PM +0200, Ni at m wrote: > >> Memory allocated for erase instruction is not freed if the sector was >> successfully erased. >> >> Signed-off-by: Dmytro Milinevskyy <niam.niam@gmail.com> >> > > Can you forward that to the right people please? Call > scripts/get_maintainer.pl to get a list of maintainers. > > Daniel > > > > >> --- >> 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); >> >> _______________________________________________ >> linux-arm-kernel mailing list >> linux-arm-kernel at lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >> > > static void jffs2_erase_callback(struct erase_info *instr) { struct erase_priv_struct *priv = (void *)instr->priv; if(instr->state != MTD_ERASE_DONE) { printk(KERN_WARNING "Erase at 0x%08x finished, but state != MTD_ERASE_DONE. State is 0x%x instead.\n", instr->addr, instr->state); jffs2_erase_failed(priv->c, priv->jeb, instr->fail_addr); } else { jffs2_erase_succeeded(priv->c, priv->jeb); } kfree(instr); } instr->callback = jffs2_erase_callback; Maybe the free is here :) Michael > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > > ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] jffs2: fix memory leak if the sector was successfully erased 2010-02-22 17:28 ` Michael Trimarchi @ 2010-02-22 17:40 ` niam 0 siblings, 0 replies; 5+ messages in thread From: niam @ 2010-02-22 17:40 UTC (permalink / raw) To: linux-arm-kernel Yes, indeed, you are right! Thank you Michael! Thank you to everybody and I'm sorry for doing that much noise here. Next time I will try to send more correct patches. However freeing memory in the callback is not obvious. Isn't better to do this out of it? -- Dima On Mon, Feb 22, 2010 at 7:28 PM, Michael Trimarchi <trimarchi@gandalf.sssup.it> wrote: > Hi, > > Daniel Mack wrote: >> >> On Mon, Feb 22, 2010 at 06:26:22PM +0200, Ni at m wrote: >> >>> >>> Memory allocated for erase instruction is not freed if the sector was >>> successfully erased. >>> >>> Signed-off-by: Dmytro Milinevskyy <niam.niam@gmail.com> >>> >> >> Can you forward that to the right people please? Call >> scripts/get_maintainer.pl to get a list of maintainers. >> >> Daniel >> >> >> >> >>> >>> --- >>> ?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); >>> >>> _______________________________________________ >>> linux-arm-kernel mailing list >>> linux-arm-kernel at lists.infradead.org >>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >>> >> >> > > static void jffs2_erase_callback(struct erase_info *instr) > { > ? ? ? struct erase_priv_struct *priv = (void *)instr->priv; > > ? ? ? if(instr->state != MTD_ERASE_DONE) { > printk(KERN_WARNING "Erase at 0x%08x finished, but state != MTD_ERASE_DONE. > State is 0x%x instead.\n", instr->addr, instr->state); > ? ? ? ? ? ? ? jffs2_erase_failed(priv->c, priv->jeb, instr->fail_addr); > ? ? ? } else { > ? ? ? ? ? ? ? jffs2_erase_succeeded(priv->c, priv->jeb); > ? ? ? } > ? ? ? kfree(instr); > } > > instr->callback = jffs2_erase_callback; > > Maybe the free is here ?:) > > Michael >> >> _______________________________________________ >> linux-arm-kernel mailing list >> linux-arm-kernel at lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >> >> > > ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-02-22 17:40 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-02-22 16:26 [PATCH] jffs2: fix memory leak if the sector was successfully erased Ni@m 2010-02-22 16:33 ` Russell King - ARM Linux 2010-02-22 16:35 ` Daniel Mack 2010-02-22 17:28 ` Michael Trimarchi 2010-02-22 17:40 ` niam
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).