History

Btrfs: fix crash in scrub repair code when device is missing

Fix that when scrub tries to repair an I/O or checksum error and one of the devices containing the mirror is missing, it crashes in bio_add_page because the bdev is a NULL pointer for missing devices.

Stefan Behrens committed 14 years ago

Commit ea9947b1 parent d04b1de1 file · +7 −0Browse files

Unified · Split

fs/btrfs/scrub.c+7−0
@@ -998,6 +998,7 @@ static int scrub_setup_recheck_block(struct scrub_dev *sdev, · 997 unmodified lines
998998 page = sblock->pagev + page_index;
999999 page->logical = logical;
10001000 page->physical = bbio->stripes[mirror_index].physical;
1001+ /* for missing devices, bdev is NULL */
10011002 page->bdev = bbio->stripes[mirror_index].dev->bdev;
10021003 page->mirror_num = mirror_index + 1;
10031004 page->page = alloc_page(GFP_NOFS);
@@ -1042,6 +1043,12 @@ static int scrub_recheck_block(struct btrfs_fs_info *fs_info, · 38 unmodified lines
10421043 struct scrub_page *page = sblock->pagev + page_num;
10431044 DECLARE_COMPLETION_ONSTACK(complete);
10441045
1046+ if (page->bdev == NULL) {
1047+ page->io_error = 1;
1048+ sblock->no_io_error_seen = 0;
1049+ continue;
1050+ }
1051+
10451052 BUG_ON(!page->page);
10461053 bio = bio_alloc(GFP_NOFS, 1);
10471054 if (!bio)