]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
scsi: core: Improve sdev_store_timeout()
authorBart Van Assche <bvanassche@acm.org>
Fri, 31 Oct 2025 22:18:44 +0000 (15:18 -0700)
committerMartin K. Petersen <martin.petersen@oracle.com>
Mon, 3 Nov 2025 02:56:22 +0000 (21:56 -0500)
Check whether or not the conversion of the argument to an integer
succeeded. Reject invalid timeout values.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://patch.msgid.link/20251031221844.2921694-1-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/scsi_sysfs.c

index 2cbbba192b246c3135ac20b6572a4322b23bf460..6b347596ef198ffd00142e42c0ed430ef65c136c 100644 (file)
@@ -648,10 +648,14 @@ static ssize_t
 sdev_store_timeout (struct device *dev, struct device_attribute *attr,
                    const char *buf, size_t count)
 {
-       struct scsi_device *sdev;
-       int timeout;
-       sdev = to_scsi_device(dev);
-       sscanf (buf, "%d\n", &timeout);
+       struct scsi_device *sdev = to_scsi_device(dev);
+       int ret, timeout;
+
+       ret = kstrtoint(buf, 0, &timeout);
+       if (ret)
+               return ret;
+       if (timeout <= 0)
+               return -EINVAL;
        blk_queue_rq_timeout(sdev->request_queue, timeout * HZ);
        return count;
 }