[PATCH RESEND 1/4] scsi: sg: fix BLKSECTGET ioctl
From: Tom Yan <hidden>
Date: 2020-09-06 01:27:27
Also in:
linux-scsi
Subsystem:
scsi sg driver, scsi subsystem, the rest · Maintainers:
Doug Gilbert, "James E.J. Bottomley", "Martin K. Petersen", Linus Torvalds
Possibly related (same subject, not in this thread)
- 2020-09-06 · [PATCH RESEND 1/4] scsi: sg: fix BLKSECTGET ioctl · Tom Yan <hidden>
It should give out the maximum number of sectors per request instead of maximum number of bytes. Signed-off-by: Tom Yan <redacted> --- drivers/scsi/sg.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 20472aaaf630..e57831910228 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c@@ -922,6 +922,7 @@ sg_ioctl_common(struct file *filp, Sg_device *sdp, Sg_fd *sfp, int result, val, read_only; Sg_request *srp; unsigned long iflags; + unsigned int max_sectors; SCSI_LOG_TIMEOUT(3, sg_printk(KERN_INFO, sdp, "sg_ioctl: cmd=0x%x\n", (int) cmd_in));
@@ -1114,8 +1115,9 @@ sg_ioctl_common(struct file *filp, Sg_device *sdp, Sg_fd *sfp, sdp->sgdebug = (char) val; return 0; case BLKSECTGET: - return put_user(max_sectors_bytes(sdp->device->request_queue), - ip); + max_sectors = min_t(unsigned int, USHRT_MAX, + queue_max_sectors(sdp->device->request_queue)); + return put_user(max_sectors, ip); case BLKTRACESETUP: return blk_trace_setup(sdp->device->request_queue, sdp->disk->disk_name,
--
2.28.0