diff options
| author | Wei Fang <fangwei1@huawei.com> | 2015-09-29 05:23:55 +0200 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2015-10-04 23:30:50 +0200 |
| commit | eb042ec35956de2684de2a05a814cd15efe570ca (patch) | |
| tree | cff4d30836e4f892dee29c12e2dfaf4f8ce88a25 /fs/jffs2 | |
| parent | mtd: nand: lpc32xx_slc: fix calculation of timing arcs from given values (diff) | |
| download | linux-eb042ec35956de2684de2a05a814cd15efe570ca.tar.xz linux-eb042ec35956de2684de2a05a814cd15efe570ca.zip | |
jffs2: fix a memleak in read_direntry()
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>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'fs/jffs2')
| -rw-r--r-- | 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 28e0aab42bc3..bfebbf13698c 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); |