badblocks: fix overlapping check for clearing (1fa9ce8d) · Commits · 戴 / test

Current bad block clear implementation assumes the range to clear overlaps with at least one bad block already stored. If given range to clear precedes first bad block in a list, the first entry is incorrectly updated. Check not only if stored block end is past clear block end but also if stored block start is before clear block end. Signed-off-by:

Tomasz Majchrzak <tomasz.majchrzak@intel.com> Acked-by:

NeilBrown <neilb@suse.com> Signed-off-by:

Jens Axboe <axboe@fb.com>

block/badblocks.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -354,7 +354,8 @@ int badblocks_clear(struct badblocks *bb, sector_t s, int sectors)
		* current range. Earlier ranges could also overlap,
		* but only this one can overlap the end of the range.
		*/
		if (BB_OFFSET(p[lo]) + BB_LEN(p[lo]) > target) {
		if ((BB_OFFSET(p[lo]) + BB_LEN(p[lo]) > target) &&
		(BB_OFFSET(p[lo]) < target)) {
		/* Partial overlap, leave the tail of this range */
		int ack = BB_ACK(p[lo]);
		sector_t a = BB_OFFSET(p[lo]);
		@@ -377,7 +378,8 @@ int badblocks_clear(struct badblocks *bb, sector_t s, int sectors)
		lo--;
		}
		while (lo >= 0 &&
		BB_OFFSET(p[lo]) + BB_LEN(p[lo]) > s) {
		(BB_OFFSET(p[lo]) + BB_LEN(p[lo]) > s) &&
		(BB_OFFSET(p[lo]) < target)) {
		/* This range does overlap */
		if (BB_OFFSET(p[lo]) < s) {
		/* Keep the early parts of this range. */

Admin message