diff options
| author |   Benjamin Coddington <bcodding@redhat.com> | 2018-01-25 09:36:26 -0500 |
|---|---|---|
| committer |   Trond Myklebust <trondmy@gmail.com> | 2018-01-25 16:42:35 -0500 |
| commit | f34462c3c8a2ec0f09003b526c4d7c08782d9350 (patch) | |
| tree | 9d0c0a8f6f81c464606d40af860d87c8c636765d /fs/nfs/blocklayout | |
| parent | pnfs/blocklayout: pnfs_block_dev_map uses bytes, not sectors (diff) | |
| download | linux-dev-f34462c3c8a2ec0f09003b526c4d7c08782d9350.tar.xz linux-dev-f34462c3c8a2ec0f09003b526c4d7c08782d9350.zip | |
pnfs/blocklayout: Ensure disk address in block device map
It's possible that the device map is smaller than the offset into the device
for the I/O we're adding. Add a check for it and bail out, otherwise we
risk botching the bio calculations that follow.
Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Trond Myklebust <trondmy@gmail.com>
Diffstat (limited to 'fs/nfs/blocklayout')
| -rw-r--r-- | fs/nfs/blocklayout/blocklayout.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c index ca6cf54b54df..7cb5c38c19e4 100644 --- a/fs/nfs/blocklayout/blocklayout.c +++ b/fs/nfs/blocklayout/blocklayout.c @@ -137,6 +137,11 @@ bl_alloc_init_bio(int npg, struct block_device *bdev, sector_t disk_sector, return bio; } +static bool offset_in_map(u64 offset, struct pnfs_block_dev_map *map) +{ + return offset >= map->start && offset < map->start + map->len; +} + static struct bio * do_add_page_to_bio(struct bio *bio, int npg, int rw, sector_t isect, struct page *page, struct pnfs_block_dev_map *map, @@ -156,8 +161,8 @@ do_add_page_to_bio(struct bio *bio, int npg, int rw, sector_t isect, /* translate to physical disk offset */ disk_addr = (u64)isect << SECTOR_SHIFT; - if (disk_addr < map->start || disk_addr >= map->start + map->len) { - if (!dev->map(dev, disk_addr, map)) + if (!offset_in_map(disk_addr, map)) { + if (!dev->map(dev, disk_addr, map) || !offset_in_map(disk_addr, map)) return ERR_PTR(-EIO); bio = bl_submit_bio(bio); } |