diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2021-04-21 13:18:35 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-04-21 18:15:25 +0300 |
| commit | 1ffec389a6431782a8a28805830b6fae9bf00af1 (patch) | |
| tree | 5eb749bdeb0c889294504c4232ea0977d0f9966b /drivers/block | |
| parent | 6327c911aa69bdf0c5f21a44970eab6dba213dde (diff) | |
| download | linux-1ffec389a6431782a8a28805830b6fae9bf00af1.tar.xz | |
ataflop: potential out of bounds in do_format()
The function uses "type" as an array index:
q = unit[drive].disk[type]->queue;
Unfortunately the bounds check on "type" isn't done until later in the
function. Fix this by moving the bounds check to the start.
Fixes: bf9c0538e485 ("ataflop: use a separate gendisk for each media format")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/ataflop.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c index 104b713f4055..aed2c2a4f4ea 100644 --- a/drivers/block/ataflop.c +++ b/drivers/block/ataflop.c @@ -729,8 +729,12 @@ static int do_format(int drive, int type, struct atari_format_descr *desc) unsigned long flags; int ret; - if (type) + if (type) { type--; + if (type >= NUM_DISK_MINORS || + minor2disktype[type].drive_types > DriveType) + return -EINVAL; + } q = unit[drive].disk[type]->queue; blk_mq_freeze_queue(q); @@ -742,11 +746,6 @@ static int do_format(int drive, int type, struct atari_format_descr *desc) local_irq_restore(flags); if (type) { - if (type >= NUM_DISK_MINORS || - minor2disktype[type].drive_types > DriveType) { - ret = -EINVAL; - goto out; - } type = minor2disktype[type].index; UDT = &atari_disk_type[type]; } |