scsi: sd: change allow_restart to bool in sysfs interface
authorweiping zhang <zhangweiping@didichuxing.com>
Thu, 12 Oct 2017 06:56:44 +0000 (14:56 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Dec 2017 09:05:01 +0000 (10:05 +0100)
[ Upstream commit 658e9a6dc1126f21fa417cd213e1cdbff8be0ba2 ]

/sys/class/scsi_disk/0:2:0:0/allow_restart can be changed to 0
unexpectedly by writing an invalid string such as the following:

echo asdf > /sys/class/scsi_disk/0:2:0:0/allow_restart

Signed-off-by: weiping zhang <zhangweiping@didichuxing.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/scsi/sd.c

index 19bfa7646c2b83f2f0c5d2354794f4edc3652c17..dd72205ba298628942ffc49d043e722428196adb 100644 (file)
@@ -259,6 +259,7 @@ static ssize_t
 allow_restart_store(struct device *dev, struct device_attribute *attr,
                    const char *buf, size_t count)
 {
+       bool v;
        struct scsi_disk *sdkp = to_scsi_disk(dev);
        struct scsi_device *sdp = sdkp->device;
 
@@ -268,7 +269,10 @@ allow_restart_store(struct device *dev, struct device_attribute *attr,
        if (sdp->type != TYPE_DISK)
                return -EINVAL;
 
-       sdp->allow_restart = simple_strtoul(buf, NULL, 10);
+       if (kstrtobool(buf, &v))
+               return -EINVAL;
+
+       sdp->allow_restart = v;
 
        return count;
 }