usb: gadget: storage: strict coversion of 'ro' parameter
authorAndy Shevchenko <andy.shevchenko@gmail.com>
Thu, 22 Jul 2010 08:58:47 +0000 (11:58 +0300)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 10 Aug 2010 21:35:42 +0000 (14:35 -0700)
Bring a strict way to get the 'ro' parameter from the user.

The patch followed by this one adds another boolean parameter. To be consistent
MichaƂ Nazarewicz proposed to use simple_strtol() in both cases (correspondend
discussion in LKML [1]). Due to simple_strtol() doesn't return error in a good
way and we have a boolean parameter the strict_strtoul() is used.

[1] http://lkml.org/lkml/2010/7/14/169

Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/gadget/storage_common.c

index a10faecfabcd91b15f241086dbf2754e7cb36baf..3bbddab72e571b35c51f194de9a37d639ced2e68 100644 (file)
@@ -748,9 +748,9 @@ static ssize_t fsg_store_ro(struct device *dev, struct device_attribute *attr,
        ssize_t         rc = count;
        struct fsg_lun  *curlun = fsg_lun_from_dev(dev);
        struct rw_semaphore     *filesem = dev_get_drvdata(dev);
-       int             i;
+       unsigned long   ro;
 
-       if (sscanf(buf, "%d", &i) != 1)
+       if (strict_strtoul(buf, 2, &ro))
                return -EINVAL;
 
        /*
@@ -762,8 +762,8 @@ static ssize_t fsg_store_ro(struct device *dev, struct device_attribute *attr,
                LDBG(curlun, "read-only status change prevented\n");
                rc = -EBUSY;
        } else {
-               curlun->ro = !!i;
-               curlun->initially_ro = !!i;
+               curlun->ro = ro;
+               curlun->initially_ro = ro;
                LDBG(curlun, "read-only status set to %d\n", curlun->ro);
        }
        up_read(filesem);