* [PATCH] jffs2: fix a memleak in read_direntry()
@ 2015-09-29 3:23 fangwei1
2015-10-04 21:47 ` Brian Norris
0 siblings, 1 reply; 2+ messages in thread
From: fangwei1 @ 2015-09-29 3:23 UTC (permalink / raw)
To: dwmw2, computersforpeace; +Cc: linux-mtd, Wei Fang
From: Wei Fang <fangwei1@huawei.com>
Need to free the memory allocated for 'fd' if failed to read all
of the remainder name.
Signed-off-by: Wei Fang <fangwei1@huawei.com>
---
fs/jffs2/readinode.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/fs/jffs2/readinode.c b/fs/jffs2/readinode.c
index 28e0aab..bfebbf1 100644
--- a/fs/jffs2/readinode.c
+++ b/fs/jffs2/readinode.c
@@ -660,8 +660,12 @@ static inline int read_direntry(struct jffs2_sb_info *c, struct jffs2_raw_node_r
err = jffs2_flash_read(c, (ref_offset(ref)) + read,
rd->nsize - already, &read, &fd->name[already]);
- if (unlikely(read != rd->nsize - already) && likely(!err))
+ if (unlikely(read != rd->nsize - already) && likely(!err)) {
+ jffs2_free_full_dirent(fd);
+ JFFS2_ERROR("short read: wanted %d bytes, got %zd\n",
+ rd->nsize - already, read);
return -EIO;
+ }
if (unlikely(err)) {
JFFS2_ERROR("read remainder of name: error %d\n", err);
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] jffs2: fix a memleak in read_direntry()
2015-09-29 3:23 [PATCH] jffs2: fix a memleak in read_direntry() fangwei1
@ 2015-10-04 21:47 ` Brian Norris
0 siblings, 0 replies; 2+ messages in thread
From: Brian Norris @ 2015-10-04 21:47 UTC (permalink / raw)
To: fangwei1, David Woodhouse; +Cc: linux-mtd
On Tue, Sep 29, 2015 at 11:23:55AM +0800, fangwei1@huawei.com wrote:
> From: Wei Fang <fangwei1@huawei.com>
>
> Need to free the memory allocated for 'fd' if failed to read all
> of the remainder name.
>
> Signed-off-by: Wei Fang <fangwei1@huawei.com>
Patch looks OK to me, and obvious. Applied, but I'm open to comments.
Brian
> ---
> fs/jffs2/readinode.c | 6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/fs/jffs2/readinode.c b/fs/jffs2/readinode.c
> index 28e0aab..bfebbf1 100644
> --- a/fs/jffs2/readinode.c
> +++ b/fs/jffs2/readinode.c
> @@ -660,8 +660,12 @@ static inline int read_direntry(struct jffs2_sb_info *c, struct jffs2_raw_node_r
>
> err = jffs2_flash_read(c, (ref_offset(ref)) + read,
> rd->nsize - already, &read, &fd->name[already]);
> - if (unlikely(read != rd->nsize - already) && likely(!err))
> + if (unlikely(read != rd->nsize - already) && likely(!err)) {
> + jffs2_free_full_dirent(fd);
> + JFFS2_ERROR("short read: wanted %d bytes, got %zd\n",
> + rd->nsize - already, read);
> return -EIO;
> + }
>
> if (unlikely(err)) {
> JFFS2_ERROR("read remainder of name: error %d\n", err);
> --
> 1.7.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-10-04 21:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-29 3:23 [PATCH] jffs2: fix a memleak in read_direntry() fangwei1
2015-10-04 21:47 ` Brian Norris
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).