[PATCH] [v2] ext4: Fix error handling code in add_new_gdb

[PATCH] [v2] ext4: Fix error handling code in add_new_gdb

[Dinghao Liu]

When ext4_journal_get_write_access() fails, we should
terminate the execution flow and release n_group_desc,
iloc.bh, dind and gdb_bh.

Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
---

Changelog:

v2: - Remove changes to ext4_handle_dirty_super()'s
      error handling path.
---
 fs/ext4/resize.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index a50b51270ea9..71bf600e5b42 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -843,8 +843,10 @@ static int add_new_gdb(handle_t *handle, struct inode *inode,
 
 	BUFFER_TRACE(dind, "get_write_access");
 	err = ext4_journal_get_write_access(handle, dind);
-	if (unlikely(err))
+	if (unlikely(err)) {
 		ext4_std_error(sb, err);
+		goto errout;
+	}
 
 	/* ext4_reserve_inode_write() gets a reference on the iloc */
 	err = ext4_reserve_inode_write(handle, inode, &iloc);
-- 
2.17.1

Re: [PATCH] [v2] ext4: Fix error handling code in add_new_gdb

[Andreas Dilger]

[-- Attachment #1: Type: text/plain, Size: 1272 bytes --]

On Aug 28, 2020, at 8:54 PM, Dinghao Liu <dinghao.liu@zju.edu.cn> wrote:
> 
> When ext4_journal_get_write_access() fails, we should
> terminate the execution flow and release n_group_desc,
> iloc.bh, dind and gdb_bh.
> 
> Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>

Looks good.  I also reviewed the other error conditions in this function
and didn't see any similar problems.

Reviewed-by: Andreas Dilger <adilger@dilger.ca>

> ---
> 
> Changelog:
> 
> v2: - Remove changes to ext4_handle_dirty_super()'s
>      error handling path.
> ---
> fs/ext4/resize.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
> index a50b51270ea9..71bf600e5b42 100644
> --- a/fs/ext4/resize.c
> +++ b/fs/ext4/resize.c
> @@ -843,8 +843,10 @@ static int add_new_gdb(handle_t *handle, struct inode *inode,
> 
> 	BUFFER_TRACE(dind, "get_write_access");
> 	err = ext4_journal_get_write_access(handle, dind);
> -	if (unlikely(err))
> +	if (unlikely(err)) {
> 		ext4_std_error(sb, err);
> +		goto errout;
> +	}
> 
> 	/* ext4_reserve_inode_write() gets a reference on the iloc */
> 	err = ext4_reserve_inode_write(handle, inode, &iloc);
> --
> 2.17.1
> 


Cheers, Andreas






[-- Attachment #2: Message signed with OpenPGP --]
[-- Type: application/pgp-signature, Size: 873 bytes --]

Re: [PATCH] [v2] ext4: Fix error handling code in add_new_gdb

[Theodore Y. Ts'o]

On Sat, Aug 29, 2020 at 10:54:02AM +0800, Dinghao Liu wrote:
> When ext4_journal_get_write_access() fails, we should
> terminate the execution flow and release n_group_desc,
> iloc.bh, dind and gdb_bh.
> 
> Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>

Thanks, applied.

				- Ted