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>

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)
                                         index, 1);
                         file->f_ra.prev_pos = (loff_t)index << PAGE_CACHE_SHIFT;
                         bh = ext4_bread(NULL, inode, map.m_lblk, 0);
-                        if (IS_ERR(bh))
-                                return PTR_ERR(bh);
+                        if (IS_ERR(bh)) {
+                                err = PTR_ERR(bh);
+                                bh = NULL;
+                                goto errout;
+                        }
                 }
 
                 if (!bh) {