linux-ext4 - Re: [PATCH 2/2] ext4: Add correct group descriptors and reserved GDT blocks to system zone

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: <tencent_C6168D4951510CC689A5A7750F17446DD905@qq.com>
Date:   Wed, 16 Aug 2023 23:27:51 +0800
From:   Wang Jianjian <wangjianjian0@...mail.com>
To:     linux-ext4@...r.kernel.org
Subject: Re: [PATCH 2/2] ext4: Add correct group descriptors and reserved GDT
 blocks to system zone

Hi all,
Any comments?

On 8/3/23 00:28, Wang Jianjian wrote:
> When setup_system_zone, flex_bg is not initialzied so it is always 1.
> ext4_num_base_meta_blocks() returns the meta blocks in this group
> including reserved GDT blocks, so let's use this helper.
> 
> Signed-off-by: Wang Jianjian <wangjianjian0@...mail.com>
> ---
>   fs/ext4/block_validity.c | 7 +++----
>   1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/ext4/block_validity.c b/fs/ext4/block_validity.c
> index 5504f72bbbbe..558e487a0b53 100644
> --- a/fs/ext4/block_validity.c
> +++ b/fs/ext4/block_validity.c
> @@ -215,7 +215,6 @@ int ext4_setup_system_zone(struct super_block *sb)
>   	struct ext4_system_blocks *system_blks;
>   	struct ext4_group_desc *gdp;
>   	ext4_group_t i;
> -	int flex_size = ext4_flex_bg_size(sbi);
>   	int ret;
>   
>   	system_blks = kzalloc(sizeof(*system_blks), GFP_KERNEL);
> @@ -224,11 +223,11 @@ int ext4_setup_system_zone(struct super_block *sb)
>   
>   	for (i=0; i < ngroups; i++) {
>   		cond_resched();
> -		if (ext4_bg_has_super(sb, i) &&
> -		    ((i < 5) || ((i % flex_size) == 0))) {
> +		unsigned int meta_blks = ext4_num_base_meta_blocks(sb, i);
> +		if (meta_blks != 0) {
>   			ret = add_system_zone(system_blks,
>   					ext4_group_first_block_no(sb, i),
> -					ext4_bg_num_gdb(sb, i) + 1, 0);
> +					meta_blks, 0);
>   			if (ret)
>   				goto err;
>   		}
>