diff mbox series

[v2] block/compat_ioctl: fix range check in BLKGETSIZE

Message ID 20220414224056.2875681-1-khazhy@google.com (mailing list archive)
State New, archived
Headers show
Series [v2] block/compat_ioctl: fix range check in BLKGETSIZE | expand

Commit Message

Khazhy Kumykov April 14, 2022, 10:40 p.m. UTC 
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>
---
 block/ioctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

v2: addressed bart's comment

Comments

Chaitanya Kulkarni April 15, 2022, 5:25 a.m. UTC | #1 
On 4/14/22 15:40, Khazhismel Kumykov wrote:
> 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>
> ---

Looks good.

Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>

-ck
Jens Axboe April 15, 2022, 12:42 p.m. UTC | #2 
On Thu, 14 Apr 2022 15:40:56 -0700, Khazhismel Kumykov wrote:
> 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.
> 
> 
> [...]

Applied, thanks!

[1/1] block/compat_ioctl: fix range check in BLKGETSIZE
      commit: ccf16413e520164eb718cf8b22a30438da80ff23

Best regards,
diff mbox series

Patch

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));