2022-11-17 23:45:16

by Kirill A. Shutemov

[permalink] [raw]
Subject: [PATCHv2] scsi: Fix get_user() in call sg_scsi_ioctl()

get_user() expects the pointer to be pointer-to-simple-variable type,
but sic->data is array of 'unsigned char'. It violates get_user()
contracts.

Explicitly take pointer to the first element of the array. It matches
current behaviour.

This is preparation for fixing sparse warnings caused by Linear Address
Masking patchset.

Signed-off-by: Kirill A. Shutemov <[email protected]>
Cc: "James E.J. Bottomley" <[email protected]>
Cc: "Martin K. Petersen" <[email protected]>
---
drivers/scsi/scsi_ioctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
index 2d20da55fb64..fdd47565a311 100644
--- a/drivers/scsi/scsi_ioctl.c
+++ b/drivers/scsi/scsi_ioctl.c
@@ -519,7 +519,7 @@ static int sg_scsi_ioctl(struct request_queue *q, fmode_t mode,
return -EFAULT;
if (in_len > PAGE_SIZE || out_len > PAGE_SIZE)
return -EINVAL;
- if (get_user(opcode, sic->data))
+ if (get_user(opcode, &sic->data[0]))
return -EFAULT;

bytes = max(in_len, out_len);
--
2.38.0



2022-11-26 03:55:24

by Martin K. Petersen

[permalink] [raw]
Subject: Re: [PATCHv2] scsi: Fix get_user() in call sg_scsi_ioctl()


Kirill,

> get_user() expects the pointer to be pointer-to-simple-variable type,
> but sic->data is array of 'unsigned char'. It violates get_user()
> contracts.

Applied to 6.2/scsi-staging, thanks!

--
Martin K. Petersen Oracle Linux Engineering

2022-11-28 09:24:44

by Kirill A. Shutemov

[permalink] [raw]
Subject: Re: [PATCHv2] scsi: Fix get_user() in call sg_scsi_ioctl()

On Fri, Nov 18, 2022 at 02:23:04AM +0300, Kirill A. Shutemov wrote:
> get_user() expects the pointer to be pointer-to-simple-variable type,
> but sic->data is array of 'unsigned char'. It violates get_user()
> contracts.
>
> Explicitly take pointer to the first element of the array. It matches
> current behaviour.
>
> This is preparation for fixing sparse warnings caused by Linear Address
> Masking patchset.
>
> Signed-off-by: Kirill A. Shutemov <[email protected]>
> Cc: "James E.J. Bottomley" <[email protected]>
> Cc: "Martin K. Petersen" <[email protected]>

James, Martin, ping?

It prevents a fix for sparse warnings from applying.

> ---
> drivers/scsi/scsi_ioctl.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
> index 2d20da55fb64..fdd47565a311 100644
> --- a/drivers/scsi/scsi_ioctl.c
> +++ b/drivers/scsi/scsi_ioctl.c
> @@ -519,7 +519,7 @@ static int sg_scsi_ioctl(struct request_queue *q, fmode_t mode,
> return -EFAULT;
> if (in_len > PAGE_SIZE || out_len > PAGE_SIZE)
> return -EINVAL;
> - if (get_user(opcode, sic->data))
> + if (get_user(opcode, &sic->data[0]))
> return -EFAULT;
>
> bytes = max(in_len, out_len);
> --
> 2.38.0
>

--
Kiryl Shutsemau / Kirill A. Shutemov

2022-12-01 03:50:00

by Martin K. Petersen

[permalink] [raw]
Subject: Re: [PATCHv2] scsi: Fix get_user() in call sg_scsi_ioctl()

On Fri, 18 Nov 2022 02:23:04 +0300, Kirill A. Shutemov wrote:

> get_user() expects the pointer to be pointer-to-simple-variable type,
> but sic->data is array of 'unsigned char'. It violates get_user()
> contracts.
>
> Explicitly take pointer to the first element of the array. It matches
> current behaviour.
>
> [...]

Applied to 6.2/scsi-queue, thanks!

[1/1] scsi: Fix get_user() in call sg_scsi_ioctl()
https://git.kernel.org/mkp/scsi/c/4e80eef45ad7

--
Martin K. Petersen Oracle Linux Engineering