From: Khazhismel Kumykov Date: Thu, 14 Apr 2022 22:40:56 +0000 (-0700) Subject: block/compat_ioctl: fix range check in BLKGETSIZE X-Git-Tag: v6.1-rc5~1391^2~14 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ccf16413e520164eb718cf8b22a30438da80ff23;p=platform%2Fkernel%2Flinux-starfive.git 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 Signed-off-by: Khazhismel Kumykov Reviewed-by: Chaitanya Kulkarni Link: https://lore.kernel.org/r/20220414224056.2875681-1-khazhy@google.com Signed-off-by: Jens Axboe --- diff --git a/block/ioctl.c b/block/ioctl.c index 4a86340..f8703db 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));