aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKirill Tkhai <ktkhai@virtuozzo.com>2016-02-16 00:20:19 -0500
committerTheodore Ts'o <tytso@mit.edu>2016-02-16 00:20:19 -0500
commitc906f38e8853cfd407b30d2f4756a93c1d8f698f (patch)
tree0b5b36250b418721d72c3321294807604c66ed2e
parent56263b4ceba90b1db77a6b31e22726f101bca807 (diff)
ext4: fix memleak in ext4_readdir()
When ext4_bread() fails, fname_crypto_str remains allocated after return. Fix that. Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> CC: Dmitry Monakhov <dmonakhov@virtuozzo.com>
-rw-r--r--fs/ext4/dir.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
index 6d17f31a31d7..33f5e2a50cf8 100644
--- a/fs/ext4/dir.c
+++ b/fs/ext4/dir.c
@@ -163,8 +163,11 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)
163 index, 1); 163 index, 1);
164 file->f_ra.prev_pos = (loff_t)index << PAGE_CACHE_SHIFT; 164 file->f_ra.prev_pos = (loff_t)index << PAGE_CACHE_SHIFT;
165 bh = ext4_bread(NULL, inode, map.m_lblk, 0); 165 bh = ext4_bread(NULL, inode, map.m_lblk, 0);
166 if (IS_ERR(bh)) 166 if (IS_ERR(bh)) {
167 return PTR_ERR(bh); 167 err = PTR_ERR(bh);
168 bh = NULL;
169 goto errout;
170 }
168 } 171 }
169 172
170 if (!bh) { 173 if (!bh) {