[ Upstream commit ccf16413e520164eb718cf8b22a30438da80ff23 ] 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@xxxxxxx> Signed-off-by: Khazhismel Kumykov <khazhy@xxxxxxxxxx> Reviewed-by: Chaitanya Kulkarni <kch@xxxxxxxxxx> Link: https://lore.kernel.org/r/20220414224056.2875681-1-khazhy@xxxxxxxxxx Signed-off-by: Jens Axboe <axboe@xxxxxxxxx> [compat_ioctl is it's own file in 5.4-stable and earlier] --- The original commit should apply to the newer stables, this should apply to all the older stables. block/compat_ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c index 7f053468b50d..d490ac220ba8 100644 --- a/block/compat_ioctl.c +++ b/block/compat_ioctl.c @@ -393,7 +393,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) return 0; case BLKGETSIZE: size = i_size_read(bdev->bd_inode); - if ((size >> 9) > ~0UL) + if ((size >> 9) > ~(compat_ulong_t)0) return -EFBIG; return compat_put_ulong(arg, size >> 9); -- 2.36.0.rc0.470.gd361397f0d-goog
