Re: [PATCHv4 1/2] usb: gadget: storage: strict coversion of 'ro' parameter

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, 22 Jul 2010, Andy Shevchenko wrote:

> 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@xxxxxxxxx>
> Cc: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
> Cc: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
> Cc: Greg Kroah-Hartman <gregkh@xxxxxxx>
> Cc: linux-usb@xxxxxxxxxxxxxxx
> ---
>  drivers/usb/gadget/storage_common.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c
> index 04c462f..7123929 100644
> --- a/drivers/usb/gadget/storage_common.c
> +++ b/drivers/usb/gadget/storage_common.c
> @@ -723,9 +723,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;
>  
>  	/* Allow the write-enable status to change only while the backing file
> @@ -735,8 +735,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);

Acked-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>

Strictly speaking, this changes the behavior when a non-binary value is
specified.  For example, if somebody were to write "10" then the old
code would set the value to True and the new code would set the value
to False -- and neither would reject it as they probably should.  
That's okay; people who write ambiguous or invalid values deserve what
they get.

Alan Stern

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux