* [PATCH] block/compat_ioctl: fix range check in BLKGETSIZE
@ 2022-04-08 23:47 Khazhismel Kumykov
2022-04-09 21:33 ` Bart Van Assche
2022-04-14 22:40 ` [PATCH v2] " Khazhismel Kumykov
0 siblings, 2 replies; 5+ messages in thread
From: Khazhismel Kumykov @ 2022-04-08 23:47 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-block, linux-kernel, Khazhismel Kumykov
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.
Signed-off-by: Khazhismel Kumykov <khazhy@google.com>
---
block/ioctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Noticed this one was sitting in my "not landed yet" pile, third time's
the charm? :)
diff --git a/block/ioctl.c b/block/ioctl.c
index 4a86340133e4..959e93a90b29 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)0UL))
return -EFBIG;
return compat_put_ulong(argp, bdev_nr_sectors(bdev));
--
2.35.1.1178.g4f1659d476-goog
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] block/compat_ioctl: fix range check in BLKGETSIZE
2022-04-08 23:47 [PATCH] block/compat_ioctl: fix range check in BLKGETSIZE Khazhismel Kumykov
@ 2022-04-09 21:33 ` Bart Van Assche
2022-04-14 22:40 ` [PATCH v2] " Khazhismel Kumykov
1 sibling, 0 replies; 5+ messages in thread
From: Bart Van Assche @ 2022-04-09 21:33 UTC (permalink / raw)
To: Khazhismel Kumykov, Jens Axboe; +Cc: linux-block, linux-kernel
On 4/8/22 16:47, 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.
>
> Signed-off-by: Khazhismel Kumykov <khazhy@google.com>
> ---
> block/ioctl.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Noticed this one was sitting in my "not landed yet" pile, third time's
> the charm? :)
>
> diff --git a/block/ioctl.c b/block/ioctl.c
> index 4a86340133e4..959e93a90b29 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)0UL))
> return -EFBIG;
> return compat_put_ulong(argp, bdev_nr_sectors(bdev));
A nit: the "UL" and two parentheses can be left out. Anyway:
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] block/compat_ioctl: fix range check in BLKGETSIZE
2022-04-08 23:47 [PATCH] block/compat_ioctl: fix range check in BLKGETSIZE Khazhismel Kumykov
2022-04-09 21:33 ` Bart Van Assche
@ 2022-04-14 22:40 ` Khazhismel Kumykov
2022-04-15 5:25 ` Chaitanya Kulkarni
2022-04-15 12:42 ` Jens Axboe
1 sibling, 2 replies; 5+ messages in thread
From: Khazhismel Kumykov @ 2022-04-14 22:40 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-block, linux-kernel, Khazhismel Kumykov, Bart Van Assche
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
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));
--
2.36.0.rc0.470.gd361397f0d-goog
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] block/compat_ioctl: fix range check in BLKGETSIZE
2022-04-14 22:40 ` [PATCH v2] " Khazhismel Kumykov
@ 2022-04-15 5:25 ` Chaitanya Kulkarni
2022-04-15 12:42 ` Jens Axboe
1 sibling, 0 replies; 5+ messages in thread
From: Chaitanya Kulkarni @ 2022-04-15 5:25 UTC (permalink / raw)
To: Khazhismel Kumykov; +Cc: linux-block, Jens Axboe, linux-kernel, Bart Van Assche
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] block/compat_ioctl: fix range check in BLKGETSIZE
2022-04-14 22:40 ` [PATCH v2] " Khazhismel Kumykov
2022-04-15 5:25 ` Chaitanya Kulkarni
@ 2022-04-15 12:42 ` Jens Axboe
1 sibling, 0 replies; 5+ messages in thread
From: Jens Axboe @ 2022-04-15 12:42 UTC (permalink / raw)
To: khazhy; +Cc: linux-kernel, bvanassche, linux-block
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,
--
Jens Axboe
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-04-15 12:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-08 23:47 [PATCH] block/compat_ioctl: fix range check in BLKGETSIZE Khazhismel Kumykov
2022-04-09 21:33 ` Bart Van Assche
2022-04-14 22:40 ` [PATCH v2] " Khazhismel Kumykov
2022-04-15 5:25 ` Chaitanya Kulkarni
2022-04-15 12:42 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®