summaryrefslogtreecommitdiff
path: root/drivers/md
diff options
context:
space:
mode:
authorMikulas Patocka <mpatocka@redhat.com>2008-10-01 14:39:24 +0100
committerAlasdair G Kergon <agk@redhat.com>2008-10-01 14:39:24 +0100
commitb01cd5ac43b00c49759c126c21e7d22c7e80b245 (patch)
treeccfda9067457032999a5d2d6ed5203caa2422937 /drivers/md
parent5037108acd4dc40c210321cc83b0bf8352eda95a (diff)
downloadlinux-3.10-b01cd5ac43b00c49759c126c21e7d22c7e80b245.tar.gz
linux-3.10-b01cd5ac43b00c49759c126c21e7d22c7e80b245.tar.bz2
linux-3.10-b01cd5ac43b00c49759c126c21e7d22c7e80b245.zip
dm: cope with access beyond end of device in dm_merge_bvec
If for any reason dm_merge_bvec() is given an offset beyond the end of the device, avoid an oops and always allow one page to be added to an empty bio. We'll reject the I/O later after the bio is submitted. Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/dm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 469cec54f37..ace998ce59f 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -843,6 +843,8 @@ static int dm_merge_bvec(struct request_queue *q,
goto out;
ti = dm_table_find_target(map, bvm->bi_sector);
+ if (!dm_target_is_valid(ti))
+ goto out_table;
/*
* Find maximum amount of I/O that won't need splitting
@@ -861,6 +863,7 @@ static int dm_merge_bvec(struct request_queue *q,
if (max_size && ti->type->merge)
max_size = ti->type->merge(ti, bvm, biovec, max_size);
+out_table:
dm_table_put(map);
out: