Commit 146e843f authored by Coly Li's avatar Coly Li Committed by Jens Axboe
Browse files

badblocks: avoid checking invalid range in badblocks_check() 



If prev_badblocks() returns '-1', it means no valid badblocks record
before the checking range. It doesn't make sense to check whether
the input checking range is overlapped with the non-existed invalid
front range.

This patch checkes whether 'prev >= 0' is true before calling
overlap_front(), to void such invalid operations.

Fixes: 3ea3354c ("badblocks: improve badblocks_check() for multiple ranges handling")
Reported-and-tested-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarColy Li <colyli@suse.de>
Link: https://lore.kernel.org/nvdimm/3035e75a-9be0-4bc3-8d4a-6e52c207f277@leemhuis.info/
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Geliang Tang <geliang.tang@suse.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: NeilBrown <neilb@suse.de>
Cc: Vishal L Verma <vishal.l.verma@intel.com>
Cc: Xiao Ni <xni@redhat.com>
Link: https://lore.kernel.org/r/20231224002820.20234-1-colyli@suse.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 13d822bf

block/badblocks.c

+4 −2
Original line number Diff line number Diff line
@@ -1312,12 +1312,14 @@ static int _badblocks_check(struct badblocks *bb, sector_t s, int sectors, 
	prev = prev_badblocks(bb, &bad, hint);



	/* start after all badblocks */

	if ((prev + 1) >= bb->count && !overlap_front(bb, prev, &bad)) {

	if ((prev >= 0) &&

	    ((prev + 1) >= bb->count) && !overlap_front(bb, prev, &bad)) {

		len = sectors;

		goto update_sectors;

	}



	if (overlap_front(bb, prev, &bad)) {

	/* Overlapped with front badblocks record */

	if ((prev >= 0) && overlap_front(bb, prev, &bad)) {

		if (BB_ACK(p[prev]))

			acked_badblocks++;

		else