diff options
| author | Coly Li <[email protected]> | 2023-12-24 08:28:20 +0800 |
|---|---|---|
| committer | Jens Axboe <[email protected]> | 2023-12-23 18:38:08 -0700 |
| commit | 146e843f6b09271233c021b1677e561b7dc16303 (patch) | |
| tree | 90929cf39bc52a763c6eb450499498d82f16ecfb | |
| parent | 13d822bf1cba78612b22a65b91cd6d4d443b6254 (diff) | |
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: 3ea3354cb9f0 ("badblocks: improve badblocks_check() for multiple ranges handling")
Reported-and-tested-by: Ira Weiny <[email protected]>
Signed-off-by: Coly Li <[email protected]>
Link: https://lore.kernel.org/nvdimm/[email protected]/
Cc: Dan Williams <[email protected]>
Cc: Geliang Tang <[email protected]>
Cc: Hannes Reinecke <[email protected]>
Cc: Jens Axboe <[email protected]>
Cc: NeilBrown <[email protected]>
Cc: Vishal L Verma <[email protected]>
Cc: Xiao Ni <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jens Axboe <[email protected]>
| -rw-r--r-- | block/badblocks.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/block/badblocks.c b/block/badblocks.c index fc92d4e18aa3..db4ec8b9b2a8 100644 --- a/block/badblocks.c +++ b/block/badblocks.c @@ -1312,12 +1312,14 @@ re_check: 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 |