linux-kernel - Re: [PATCH 08/12] badblocks: fix merge issue when new badblocks align with pre+1

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: <b37f7500-f095-912f-cf81-aa0b214a53bf@huaweicloud.com>
Date: Sat, 22 Feb 2025 09:21:34 +0800
From: Yu Kuai <yukuai1@...weicloud.com>
To: Zheng Qixing <zhengqixing@...weicloud.com>, axboe@...nel.dk,
 song@...nel.org, colyli@...nel.org, dan.j.williams@...el.com,
 vishal.l.verma@...el.com, dave.jiang@...el.com, ira.weiny@...el.com,
 dlemoal@...nel.org, yanjun.zhu@...ux.dev, kch@...dia.com, hare@...e.de,
 zhengqixing@...wei.com, john.g.garry@...cle.com, geliang@...nel.org,
 xni@...hat.com, colyli@...e.de
Cc: linux-block@...r.kernel.org, linux-kernel@...r.kernel.org,
 linux-raid@...r.kernel.org, nvdimm@...ts.linux.dev, yi.zhang@...wei.com,
 yangerkun@...wei.com, "yukuai (C)" <yukuai3@...wei.com>
Subject: Re: [PATCH 08/12] badblocks: fix merge issue when new badblocks align
 with pre+1

在 2025/02/21 16:11, Zheng Qixing 写道:
> From: Li Nan <linan122@...wei.com>
> 
> There is a merge issue when adding badblocks as follow:
>    echo 0 10 > bad_blocks
>    echo 30 10 > bad_blocks
>    echo 20 10 > bad_blocks
>    cat bad_blocks
>    0 10
>    20 10    //should be merged with (30 10)
>    30 10
> 
> In this case, if new badblocks does not intersect with prev, it is added
> by insert_at(). If there is an intersection with prev+1, the merge will
> be processed in the next re_insert loop.
> 
> However, when the end of the new badblocks is exactly equal to the offset
> of prev+1, no further re_insert loop occurs, and the two badblocks are not
> merge.
> 
> Fix it by inc prev, badblocks can be merged during the subsequent code.
> 
> Fixes: aa511ff8218b ("badblocks: switch to the improved badblock handling code")
> Signed-off-by: Li Nan <linan122@...wei.com>
> ---
>   block/badblocks.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
LGTM
Reviewed-by: Yu Kuai <yukuai3@...wei.com>

> diff --git a/block/badblocks.c b/block/badblocks.c
> index bb46bab7e99f..381f9db423d6 100644
> --- a/block/badblocks.c
> +++ b/block/badblocks.c
> @@ -892,7 +892,7 @@ static int _badblocks_set(struct badblocks *bb, sector_t s, int sectors,
>   		len = insert_at(bb, 0, &bad);
>   		bb->count++;
>   		added++;
> -		hint = 0;
> +		hint = ++prev;
>   		goto update_sectors;
>   	}
>   
> @@ -947,7 +947,7 @@ static int _badblocks_set(struct badblocks *bb, sector_t s, int sectors,
>   	len = insert_at(bb, prev + 1, &bad);
>   	bb->count++;
>   	added++;
> -	hint = prev + 1;
> +	hint = ++prev;
>   
>   update_sectors:
>   	s += len;
>