diff options
| author | Jens Axboe <axboe@fb.com> | 2014-11-19 13:06:22 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-02-20 00:49:25 +0000 |
| commit | 44cee4aa677c9cc2a48d2bdde8928115e06cb9a0 (patch) | |
| tree | f4fa3df4b6c649d033978b4d3b76015cffad5baa /block | |
| parent | 3cf6ed7571ec1ad4cbec7ae63fef0288c2370c0b (diff) | |
| download | kernel_samsung_smdk4412-44cee4aa677c9cc2a48d2bdde8928115e06cb9a0.zip kernel_samsung_smdk4412-44cee4aa677c9cc2a48d2bdde8928115e06cb9a0.tar.gz kernel_samsung_smdk4412-44cee4aa677c9cc2a48d2bdde8928115e06cb9a0.tar.bz2 | |
genhd: check for int overflow in disk_expand_part_tbl()
commit 5fabcb4c33fe11c7e3afdf805fde26c1a54d0953 upstream.
We can get here from blkdev_ioctl() -> blkpg_ioctl() -> add_partition()
with a user passed in partno value. If we pass in 0x7fffffff, the
new target in disk_expand_part_tbl() overflows the 'int' and we
access beyond the end of ptbl->part[] and even write to it when we
do the rcu_assign_pointer() to assign the new partition.
Reported-by: David Ramos <daramos@stanford.edu>
Signed-off-by: Jens Axboe <axboe@fb.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/genhd.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/block/genhd.c b/block/genhd.c index 41b0435..424d1fa 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1070,9 +1070,16 @@ int disk_expand_part_tbl(struct gendisk *disk, int partno) struct disk_part_tbl *old_ptbl = disk->part_tbl; struct disk_part_tbl *new_ptbl; int len = old_ptbl ? old_ptbl->len : 0; - int target = partno + 1; + int i, target; size_t size; - int i; + + /* + * check for int overflow, since we can get here from blkpg_ioctl() + * with a user passed 'partno'. + */ + target = partno + 1; + if (target < 0) + return -EINVAL; /* disk_max_parts() is zero during initialization, ignore if so */ if (disk_max_parts(disk) && target > disk_max_parts(disk)) |