diff options
| author |   Khazhismel Kumykov <khazhy@google.com> | 2022-04-14 15:40:56 -0700 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2022-04-15 06:32:40 -0600 |
| commit | ccf16413e520164eb718cf8b22a30438da80ff23 (patch) | |
| tree | c30054528fcd0e81531a4311abb380cce475ade2 /block | |
| parent | block: null_blk: end timed out poll request (diff) | |
| download | linux-dev-ccf16413e520164eb718cf8b22a30438da80ff23.tar.xz linux-dev-ccf16413e520164eb718cf8b22a30438da80ff23.zip | |
block/compat_ioctl: fix range check in BLKGETSIZE
kernel ulong and compat_ulong_t may not be same width. Use type directly
to eliminate mismatches.
This would result in truncation rather than EFBIG for 32bit mode for
large disks.
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Khazhismel Kumykov <khazhy@google.com>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20220414224056.2875681-1-khazhy@google.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/ioctl.c b/block/ioctl.c index 4a86340133e4..f8703db99c73 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -629,7 +629,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) return compat_put_long(argp, (bdev->bd_disk->bdi->ra_pages * PAGE_SIZE) / 512); case BLKGETSIZE: - if (bdev_nr_sectors(bdev) > ~0UL) + if (bdev_nr_sectors(bdev) > ~(compat_ulong_t)0) return -EFBIG; return compat_put_ulong(argp, bdev_nr_sectors(bdev)); |