linux-ext4 - Re: [PATCH 2/3] ext4: cleanup goto next group

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20170821075831.GA20202@quack2.suse.cz>
Date:   Mon, 21 Aug 2017 09:58:31 +0200
From:   Jan Kara <jack@...e.cz>
To:     Wang Shilong <wangshilong1991@...il.com>
Cc:     linux-ext4@...r.kernel.org, sihara@....com, lixi@....com,
        wshilong@....com
Subject: Re: [PATCH 2/3] ext4: cleanup goto next group

On Sun 20-08-17 19:53:25, Wang Shilong wrote:
> From: Wang Shilong <wshilong@....com>
> 
> avoid duplicated codes, also we need goto
> next group in case we found reserved inode.
> 
> Signed-off-by: Wang Shilong <wshilong@....com>

Looks good. You can add:

Reviewed-by: Jan Kara <jack@...e.cz>

								Honza

> ---
>  fs/ext4/ialloc.c | 20 ++++++--------------
>  1 file changed, 6 insertions(+), 14 deletions(-)
> 
> diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
> index 0d03e73..9e6eb1c 100644
> --- a/fs/ext4/ialloc.c
> +++ b/fs/ext4/ialloc.c
> @@ -892,19 +892,13 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir,
>  		/*
>  		 * Check free inodes count before loading bitmap.
>  		 */
> -		if (ext4_free_inodes_count(sb, gdp) == 0) {
> -			if (++group == ngroups)
> -				group = 0;
> -			continue;
> -		}
> +		if (ext4_free_inodes_count(sb, gdp) == 0)
> +			goto next_group;
>  
>  		grp = ext4_get_group_info(sb, group);
>  		/* Skip groups with already-known suspicious inode tables */
> -		if (EXT4_MB_GRP_IBITMAP_CORRUPT(grp)) {
> -			if (++group == ngroups)
> -				group = 0;
> -			continue;
> -		}
> +		if (EXT4_MB_GRP_IBITMAP_CORRUPT(grp))
> +			goto next_group;
>  
>  		brelse(inode_bitmap_bh);
>  		inode_bitmap_bh = ext4_read_inode_bitmap(sb, group);
> @@ -912,9 +906,7 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir,
>  		if (EXT4_MB_GRP_IBITMAP_CORRUPT(grp) ||
>  		    IS_ERR(inode_bitmap_bh)) {
>  			inode_bitmap_bh = NULL;
> -			if (++group == ngroups)
> -				group = 0;
> -			continue;
> +			goto next_group;
>  		}
>  
>  repeat_in_this_group:
> @@ -926,7 +918,7 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir,
>  		if (group == 0 && (ino+1) < EXT4_FIRST_INO(sb)) {
>  			ext4_error(sb, "reserved inode found cleared - "
>  				   "inode=%lu", ino + 1);
> -			continue;
> +			goto next_group;
>  		}
>  		if ((EXT4_SB(sb)->s_journal == NULL) &&
>  		    recently_deleted(sb, group, ino)) {
> -- 
> 2.9.3
> 
-- 
Jan Kara <jack@...e.com>
SUSE Labs, CR