Commit 389f239c authored by Chris Mason's avatar Chris Mason

btrfs: make sure we stay inside the bvec during __btrfs_lookup_bio_sums

Commit c40a3d38 (Btrfs: Compute and look up csums based on
sectorsized blocks) changes around how we walk the bios while looking up
crcs.  There's an inner loop that is jumping to the next bvec based on
sectors and before it derefs the next bvec, it needs to make sure we're
still in the bio.

In this case, the outer loop would have decided to stop moving forward
too, and the bvec deref is never actually used for anything.  But
CONFIG_DEBUG_PAGEALLOC catches it because we're outside our bio.
Signed-off-by: default avatarChris Mason <clm@fb.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
parent bb7ab3b9
...@@ -292,12 +292,22 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root, ...@@ -292,12 +292,22 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root,
page_bytes_left -= root->sectorsize; page_bytes_left -= root->sectorsize;
if (!page_bytes_left) { if (!page_bytes_left) {
bio_index++; bio_index++;
/*
* make sure we're still inside the
* bio before we update page_bytes_left
*/
if (bio_index >= bio->bi_vcnt) {
WARN_ON_ONCE(count);
goto done;
}
bvec++; bvec++;
page_bytes_left = bvec->bv_len; page_bytes_left = bvec->bv_len;
} }
} }
} }
done:
btrfs_free_path(path); btrfs_free_path(path);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment