| Message ID | c747413b-f5e1-d3e0-650b-e3749a98d59d@virtuozzo.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | ext4: number of long lived errors | expand |
On Wed, Oct 31, 2018 at 12:58:31AM +0300, Vasily Averin wrote: > iloc.bh os taken in ext4_reserve_inode_write(). > If (dirty == true) it is released in ext4_mark_iloc_dirty(), > however it is not released in (dirty == false) case. > > Fixes d745a8c20c1f ("ext4: reduce contention on s_orphan_lock") > however iloc.bh count balance was broken earlier by > Fixes 6e3617e579e0 ("ext4: Handle non empty on-disk orphan link") #2.6.34 > > cc: Dmitry Monakhov <dmonakhov@gmail.com> > Signed-off-by: Vasily Averin <vvs@virtuozzo.com> Thanks, applied. I fixed up the commit description and Fixes/Cc trailers. I used the one-line description: ext4: avoid buffer leak in ext4_orphan_add() after prior errors - Ted
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 67a38532032a..d388cce72db2 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -2811,7 +2811,9 @@ int ext4_orphan_add(handle_t *handle, struct inode *inode) list_del_init(&EXT4_I(inode)->i_orphan); mutex_unlock(&sbi->s_orphan_lock); } - } + } else + brelse(iloc.bh); + jbd_debug(4, "superblock will point to %lu\n", inode->i_ino); jbd_debug(4, "orphan inode %lu will point to %d\n", inode->i_ino, NEXT_ORPHAN(inode));
iloc.bh os taken in ext4_reserve_inode_write(). If (dirty == true) it is released in ext4_mark_iloc_dirty(), however it is not released in (dirty == false) case. Fixes d745a8c20c1f ("ext4: reduce contention on s_orphan_lock") however iloc.bh count balance was broken earlier by Fixes 6e3617e579e0 ("ext4: Handle non empty on-disk orphan link") #2.6.34 cc: Dmitry Monakhov <dmonakhov@gmail.com> Signed-off-by: Vasily Averin <vvs@virtuozzo.com> --- fs/ext4/namei.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)