summaryrefslogtreecommitdiff
path: root/fs/ext4/inode.c
diff options
context:
space:
mode:
authorVasily Averin <vvs@virtuozzo.com>2018-11-06 16:49:50 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-11-21 09:24:12 +0100
commitda497e7a38bb774a1ed6f6264b52704c9330e1fd (patch)
tree1bd4bc9eae7b6b2caee4c269172f8315123f97a8 /fs/ext4/inode.c
parent3caa7b620c0f9e2047468447ab26684daae1913f (diff)
ext4: avoid buffer leak on shutdown in ext4_mark_iloc_dirty()
commit a6758309a005060b8297a538a457c88699cb2520 upstream. ext4_mark_iloc_dirty() callers expect that it releases iloc->bh even if it returns an error. Fixes: 0db1ff222d40 ("ext4: add shutdown bit and check for it") Signed-off-by: Vasily Averin <vvs@virtuozzo.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Cc: stable@kernel.org # 4.11 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/ext4/inode.c')
-rw-r--r--fs/ext4/inode.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 9808df52ceca..bd2bf83b1a1f 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -5671,9 +5671,10 @@ int ext4_mark_iloc_dirty(handle_t *handle,
{
int err = 0;
- if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb))))
+ if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb)))) {
+ put_bh(iloc->bh);
return -EIO;
-
+ }
if (IS_I_VERSION(inode))
inode_inc_iversion(inode);