lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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.

Reported-by: Marco L. Crociani <marco.crociani@gmail.com>
Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Stefan Behrens
2012-05-04 15:16:07 -04:00
committed by Chris Mason
parent d04b1debc9
commit ea9947b439
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/btrfs/scrub.c
View File

@@ -998,6 +998,7 @@ static int scrub_setup_recheck_block(struct scrub_dev *sdev,
page = sblock->pagev + page_index; page = sblock->pagev + page_index;
page->logical = logical; page->logical = logical;
page->physical = bbio->stripes[mirror_index].physical; page->physical = bbio->stripes[mirror_index].physical;
/* for missing devices, bdev is NULL */
page->bdev = bbio->stripes[mirror_index].dev->bdev; page->bdev = bbio->stripes[mirror_index].dev->bdev;
page->mirror_num = mirror_index + 1; page->mirror_num = mirror_index + 1;
page->page = alloc_page(GFP_NOFS); page->page = alloc_page(GFP_NOFS);
@@ -1042,6 +1043,12 @@ static int scrub_recheck_block(struct btrfs_fs_info *fs_info,
struct scrub_page *page = sblock->pagev + page_num; struct scrub_page *page = sblock->pagev + page_num;
DECLARE_COMPLETION_ONSTACK(complete); DECLARE_COMPLETION_ONSTACK(complete);
if (page->bdev == NULL) {
page->io_error = 1;
sblock->no_io_error_seen = 0;
continue;
}
BUG_ON(!page->page); BUG_ON(!page->page);
bio = bio_alloc(GFP_NOFS, 1); bio = bio_alloc(GFP_NOFS, 1);
if (!bio) if (!bio)