2018-10-30 22:00:45

by Vasily Averin

Subject: [PATCH v2 07/11] ext4: lost put_bh in ext4_mark_iloc_dirty()

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") # 4.11

Signed-off-by: Vasily Averin <[email protected]>
---
fs/ext4/inode.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index c3d9a42c561e..55c8fca76daf 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -5835,9 +5835,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);

--
2.17.1

2018-11-06 21:55:26

by Theodore Ts'o

Subject: Re: [PATCH v2 07/11] ext4: lost put_bh in ext4_mark_iloc_dirty()

On Wed, Oct 31, 2018 at 12:58:24AM +0300, Vasily Averin wrote:
> 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") # 4.11
>
> Signed-off-by: Vasily Averin <[email protected]>

Thanks, applied. I fixed up the commit description and Fixes/Cc
trailers. I used the one-line description:

ext4: avoid buffer leak on shutdown in ext4_mark_iloc_dirty()

- Ted