diff options
| author | Wei Fang <fangwei1@huawei.com> | 2015-09-29 11:23:55 +0800 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-07-16 07:22:12 +0200 |
| commit | 410dd26712292a0fb0012f1a053c6cb1c16668f4 (patch) | |
| tree | a109e9b41f97f16be313705d73bfe4f81ad9dba0 /cpukit/libfs | |
| parent | jffs2: fix unbalanced locking (diff) | |
| download | rtems-410dd26712292a0fb0012f1a053c6cb1c16668f4.tar.bz2 | |
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 'cpukit/libfs')
| -rw-r--r-- | cpukit/libfs/src/jffs2/src/readinode.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cpukit/libfs/src/jffs2/src/readinode.c b/cpukit/libfs/src/jffs2/src/readinode.c index 69ab7709f8..ba1ad6a22f 100644 --- a/cpukit/libfs/src/jffs2/src/readinode.c +++ b/cpukit/libfs/src/jffs2/src/readinode.c @@ -669,8 +669,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); |