Skip to contentSkip to conversation

scsi: Fix get_user() in call sg_scsi_ioctl()

PATCH Applied Kirill A. Shutemov 3 participants 4 messages Nov 17, 2022 – Dec 1, 2022 SCSI

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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.

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(-)
drivers/scsi/scsi_ioctl.c +1 -1
index 2d20da55fb64..fdd47565a311 100644
@@ -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);
Signature · 1 line
2.38.0
#1 lore raw

Kirill,

Quoted 3 lines

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!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering
#2 lore raw
In reply to Kirill A. Shutemov
Quoted 7 lines · Kirill A. Shutemov

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.

Quoted 6 lines

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

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.

Quoted 20 lines
---
 drivers/scsi/scsi_ioctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/scsi_ioctl.c +1 -1
index 2d20da55fb64..fdd47565a311 100644
@@ -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);
Signature · 1 line
2.38.0
Signature · 1 line
  Kiryl Shutsemau / Kirill A. Shutemov
#3 lore raw
In reply to Kirill A. Shutemov
Quoted 8 lines · Kirill A. Shutemov

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
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering