diff options
| author | Kirill Tkhai <ktkhai@virtuozzo.com> | 2016-02-16 00:20:19 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2016-02-16 00:20:19 -0500 |
| commit | c906f38e8853cfd407b30d2f4756a93c1d8f698f (patch) | |
| tree | 0b5b36250b418721d72c3321294807604c66ed2e /fs/ext4/dir.c | |
| parent | 56263b4ceba90b1db77a6b31e22726f101bca807 (diff) | |
| download | talos-obmc-linux-c906f38e8853cfd407b30d2f4756a93c1d8f698f.tar.gz talos-obmc-linux-c906f38e8853cfd407b30d2f4756a93c1d8f698f.zip | |
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>
Diffstat (limited to 'fs/ext4/dir.c')
| -rw-r--r-- | fs/ext4/dir.c | 7 |
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) { |
