* [PATCH] block/compat_ioctl: fix range check in BLKGETSIZE
@ 2018-04-06 22:23 Khazhismel Kumykov
2018-07-31 18:23 ` Khazhismel Kumykov
2018-08-02 21:31 ` Jens Axboe
0 siblings, 2 replies; 9+ messages in thread
From: Khazhismel Kumykov @ 2018-04-06 22:23 UTC (permalink / raw)
To: axboe; +Cc: linux-block, linux-kernel, Khazhismel Kumykov
[-- Attachment #1: Type: text/plain, Size: 806 bytes --]
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/compat_ioctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
index 6ca015f92766..3a2c77f07da8 100644
--- a/block/compat_ioctl.c
+++ b/block/compat_ioctl.c
@@ -388,7 +388,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)0UL))
return -EFBIG;
return compat_put_ulong(arg, size >> 9);
--
2.17.0.484.g0c8726318c-goog
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4843 bytes --]
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] block/compat_ioctl: fix range check in BLKGETSIZE
2018-04-06 22:23 [PATCH] block/compat_ioctl: fix range check in BLKGETSIZE Khazhismel Kumykov
@ 2018-07-31 18:23 ` Khazhismel Kumykov
2018-08-02 21:31 ` Jens Axboe
1 sibling, 0 replies; 9+ messages in thread
From: Khazhismel Kumykov @ 2018-07-31 18:23 UTC (permalink / raw)
To: axboe; +Cc: linux-block, Linux Kernel Mailing List, Khazhismel Kumykov
[-- Attachment #1: Type: text/plain, Size: 1029 bytes --]
Ping?
On Fri, Apr 6, 2018 at 3:23 PM, Khazhismel Kumykov <khazhy@google.com> 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/compat_ioctl.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
> index 6ca015f92766..3a2c77f07da8 100644
> --- a/block/compat_ioctl.c
> +++ b/block/compat_ioctl.c
> @@ -388,7 +388,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)0UL))
> return -EFBIG;
> return compat_put_ulong(arg, size >> 9);
>
> --
> 2.17.0.484.g0c8726318c-goog
>
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4843 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] block/compat_ioctl: fix range check in BLKGETSIZE
2018-04-06 22:23 [PATCH] block/compat_ioctl: fix range check in BLKGETSIZE Khazhismel Kumykov
2018-07-31 18:23 ` Khazhismel Kumykov
@ 2018-08-02 21:31 ` Jens Axboe
1 sibling, 0 replies; 9+ messages in thread
From: Jens Axboe @ 2018-08-02 21:31 UTC (permalink / raw)
To: Khazhismel Kumykov; +Cc: linux-block, linux-kernel
On 4/6/18 4:23 PM, 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.
Sorry for not getting to this. Applied, thanks.
--
Jens Axboe
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] block/compat_ioctl: fix range check in BLKGETSIZE
2022-04-25 19:29 ` Khazhy Kumykov
@ 2022-04-26 6:39 ` Greg KH
0 siblings, 0 replies; 9+ messages in thread
From: Greg KH @ 2022-04-26 6:39 UTC (permalink / raw)
To: Khazhy Kumykov; +Cc: stable, Bart Van Assche, Chaitanya Kulkarni, Jens Axboe
On Mon, Apr 25, 2022 at 12:29:41PM -0700, Khazhy Kumykov wrote:
> On Thu, Apr 21, 2022 at 3:02 AM Greg KH <gregkh@linuxfoundation.org> wrote:
> >
> > On Tue, Apr 19, 2022 at 12:12:39PM -0700, Khazhismel Kumykov wrote:
> > > [ 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@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>
> > > [compat_ioctl is it's own file in 5.4-stable and earlier]
> > > ---
> > >
> > > The original commit should apply to the newer stables
> >
> > It does not, it only applied to 5.17.y.
> >
> > Please provide working backports for all of the others.
> >
> > > this should apply
> > > to all the older stables.
> >
> > I'll wait for the 5.10.y and 5.15.y backport first before applying this
> > one.
> I double checked and the above patch applied to 4.9-5.4 for me
All now queued up, thanks.
greg k-h
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] block/compat_ioctl: fix range check in BLKGETSIZE
2022-04-21 10:02 ` Greg KH
@ 2022-04-25 19:29 ` Khazhy Kumykov
2022-04-26 6:39 ` Greg KH
0 siblings, 1 reply; 9+ messages in thread
From: Khazhy Kumykov @ 2022-04-25 19:29 UTC (permalink / raw)
To: Greg KH; +Cc: stable, Bart Van Assche, Chaitanya Kulkarni, Jens Axboe
[-- Attachment #1: Type: text/plain, Size: 1174 bytes --]
On Thu, Apr 21, 2022 at 3:02 AM Greg KH <gregkh@linuxfoundation.org> wrote:
>
> On Tue, Apr 19, 2022 at 12:12:39PM -0700, Khazhismel Kumykov wrote:
> > [ 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@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>
> > [compat_ioctl is it's own file in 5.4-stable and earlier]
> > ---
> >
> > The original commit should apply to the newer stables
>
> It does not, it only applied to 5.17.y.
>
> Please provide working backports for all of the others.
>
> > this should apply
> > to all the older stables.
>
> I'll wait for the 5.10.y and 5.15.y backport first before applying this
> one.
I double checked and the above patch applied to 4.9-5.4 for me
>
> thanks,
>
> greg k-h
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 3999 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] block/compat_ioctl: fix range check in BLKGETSIZE
2022-04-19 19:12 Khazhismel Kumykov
@ 2022-04-21 10:02 ` Greg KH
2022-04-25 19:29 ` Khazhy Kumykov
0 siblings, 1 reply; 9+ messages in thread
From: Greg KH @ 2022-04-21 10:02 UTC (permalink / raw)
To: Khazhismel Kumykov
Cc: stable, Bart Van Assche, Chaitanya Kulkarni, Jens Axboe
On Tue, Apr 19, 2022 at 12:12:39PM -0700, Khazhismel Kumykov wrote:
> [ 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@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>
> [compat_ioctl is it's own file in 5.4-stable and earlier]
> ---
>
> The original commit should apply to the newer stables
It does not, it only applied to 5.17.y.
Please provide working backports for all of the others.
> this should apply
> to all the older stables.
I'll wait for the 5.10.y and 5.15.y backport first before applying this
one.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] block/compat_ioctl: fix range check in BLKGETSIZE
@ 2022-04-19 19:12 Khazhismel Kumykov
2022-04-21 10:02 ` Greg KH
0 siblings, 1 reply; 9+ messages in thread
From: Khazhismel Kumykov @ 2022-04-19 19:12 UTC (permalink / raw)
To: stable
Cc: Khazhismel Kumykov, Bart Van Assche, Chaitanya Kulkarni, Jens Axboe
[ 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@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>
[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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] block/compat_ioctl: fix range check in BLKGETSIZE
2022-04-08 23:47 Khazhismel Kumykov
@ 2022-04-09 21:33 ` Bart Van Assche
0 siblings, 0 replies; 9+ 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] 9+ messages in thread
* [PATCH] block/compat_ioctl: fix range check in BLKGETSIZE
@ 2022-04-08 23:47 Khazhismel Kumykov
2022-04-09 21:33 ` Bart Van Assche
0 siblings, 1 reply; 9+ 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 related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-04-26 6:39 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-06 22:23 [PATCH] block/compat_ioctl: fix range check in BLKGETSIZE Khazhismel Kumykov
2018-07-31 18:23 ` Khazhismel Kumykov
2018-08-02 21:31 ` Jens Axboe
2022-04-08 23:47 Khazhismel Kumykov
2022-04-09 21:33 ` Bart Van Assche
2022-04-19 19:12 Khazhismel Kumykov
2022-04-21 10:02 ` Greg KH
2022-04-25 19:29 ` Khazhy Kumykov
2022-04-26 6:39 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.