diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2021-04-21 13:19:45 +0300 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2021-04-21 09:15:27 -0600 |
| commit | b777f4c47781df6b23e3f4df6fdb92d9aceac7bb (patch) | |
| tree | 09f33669152fbb521e3e8f8cf7f91df5a158f784 /drivers/block | |
| parent | ataflop: potential out of bounds in do_format() (diff) | |
| download | linux-dev-b777f4c47781df6b23e3f4df6fdb92d9aceac7bb.tar.xz linux-dev-b777f4c47781df6b23e3f4df6fdb92d9aceac7bb.zip | |
ataflop: fix off by one in ataflop_probe()
Smatch complains that the "type > NUM_DISK_MINORS" should be >=
instead of >. We also need to subtract one from "type" at 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 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c index aed2c2a4f4ea..d601e49f80e0 100644 --- a/drivers/block/ataflop.c +++ b/drivers/block/ataflop.c @@ -2001,7 +2001,10 @@ static void ataflop_probe(dev_t dev) int drive = MINOR(dev) & 3; int type = MINOR(dev) >> 2; - if (drive >= FD_MAX_UNITS || type > NUM_DISK_MINORS) + if (type) + type--; + + if (drive >= FD_MAX_UNITS || type >= NUM_DISK_MINORS) return; mutex_lock(&ataflop_probe_lock); if (!unit[drive].disk[type]) { |