ext4: fix buffer leak in __ext4_read_dirblock() on error path

vaverin · tytso · commit de59fae0043f · 2018-11-07T22:36:23.000-05:00
Fixes: dc6982f ("ext4: refactor code to read directory blocks ...") Signed-off-by: Vasily Averin <vvs@virtuozzo.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Cc: stable@kernel.org # 3.9
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
@@ -126,6 +126,7 @@ static struct buffer_head *__ext4_read_dirblock(struct inode *inode,
 	if (!is_dx_block && type == INDEX) {
 		ext4_error_inode(inode, func, line, block,
 		       "directory leaf block found instead of index block");
+		brelse(bh);
 		return ERR_PTR(-EFSCORRUPTED);
 	}
 	if (!ext4_has_metadata_csum(inode->i_sb) ||

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,7 @@ static struct buffer_head __ext4_read_dirblock(struct inode inode,`
`126`	`126`	`if (!is_dx_block && type == INDEX) {`
`127`	`127`	`ext4_error_inode(inode, func, line, block,`
`128`	`128`	`"directory leaf block found instead of index block");`
	`129`	`+ brelse(bh);`
`129`	`130`	`return ERR_PTR(-EFSCORRUPTED);`
`130`	`131`	`}`
`131`	`132`	`if (!ext4_has_metadata_csum(inode->i_sb) \|\|`