linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net] usbnet: fix error return code in usbnet_probe()
@ 2021-10-26 11:25 Wang Hai
  2021-10-26 11:54 ` Johan Hovold
  0 siblings, 1 reply; 3+ messages in thread
From: Wang Hai @ 2021-10-26 11:25 UTC (permalink / raw)
  To: oneukum, davem, kuba, johan; +Cc: netdev, linux-usb, linux-kernel

Return error code if usb_maxpacket() returns 0 in usbnet_probe().

Fixes: 397430b50a36 ("usbnet: sanity check for maxpacket")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wang Hai <wanghai38@huawei.com>
---
 drivers/net/usb/usbnet.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 80432ee0ce69..fb5bf7d36d50 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1790,6 +1790,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
 	dev->maxpacket = usb_maxpacket (dev->udev, dev->out, 1);
 	if (dev->maxpacket == 0) {
 		/* that is a broken device */
+		status = -EINVAL;
 		goto out4;
 	}
 
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH net] usbnet: fix error return code in usbnet_probe()
  2021-10-26 11:25 [PATCH net] usbnet: fix error return code in usbnet_probe() Wang Hai
@ 2021-10-26 11:54 ` Johan Hovold
  2021-10-26 12:17   ` wanghai (M)
  0 siblings, 1 reply; 3+ messages in thread
From: Johan Hovold @ 2021-10-26 11:54 UTC (permalink / raw)
  To: Wang Hai; +Cc: oneukum, davem, kuba, netdev, linux-usb, linux-kernel

On Tue, Oct 26, 2021 at 07:25:26PM +0800, Wang Hai wrote:
> Return error code if usb_maxpacket() returns 0 in usbnet_probe().
> 
> Fixes: 397430b50a36 ("usbnet: sanity check for maxpacket")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Wang Hai <wanghai38@huawei.com>
> ---

Good catch. This is embarrassing. I double checked the error path but
failed to notice the missing return value.

>  drivers/net/usb/usbnet.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
> index 80432ee0ce69..fb5bf7d36d50 100644
> --- a/drivers/net/usb/usbnet.c
> +++ b/drivers/net/usb/usbnet.c
> @@ -1790,6 +1790,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
>  	dev->maxpacket = usb_maxpacket (dev->udev, dev->out, 1);
>  	if (dev->maxpacket == 0) {
>  		/* that is a broken device */
> +		status = -EINVAL;

But please use -ENODEV here. -EINVAL is typically reserved for bad user
input.

>  		goto out4;
>  	}

Johan

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH net] usbnet: fix error return code in usbnet_probe()
  2021-10-26 11:54 ` Johan Hovold
@ 2021-10-26 12:17   ` wanghai (M)
  0 siblings, 0 replies; 3+ messages in thread
From: wanghai (M) @ 2021-10-26 12:17 UTC (permalink / raw)
  To: Johan Hovold; +Cc: oneukum, davem, kuba, netdev, linux-usb, linux-kernel


在 2021/10/26 19:54, Johan Hovold 写道:
> On Tue, Oct 26, 2021 at 07:25:26PM +0800, Wang Hai wrote:
>> Return error code if usb_maxpacket() returns 0 in usbnet_probe().
>>
>> Fixes: 397430b50a36 ("usbnet: sanity check for maxpacket")
>> Reported-by: Hulk Robot <hulkci@huawei.com>
>> Signed-off-by: Wang Hai <wanghai38@huawei.com>
>> ---
> Good catch. This is embarrassing. I double checked the error path but
> failed to notice the missing return value.
>
>>   drivers/net/usb/usbnet.c | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
>> index 80432ee0ce69..fb5bf7d36d50 100644
>> --- a/drivers/net/usb/usbnet.c
>> +++ b/drivers/net/usb/usbnet.c
>> @@ -1790,6 +1790,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
>>   	dev->maxpacket = usb_maxpacket (dev->udev, dev->out, 1);
>>   	if (dev->maxpacket == 0) {
>>   		/* that is a broken device */
>> +		status = -EINVAL;
> But please use -ENODEV here. -EINVAL is typically reserved for bad user
> input.
Ok, I will send v2
>>   		goto out4;
>>   	}
> Johan
> .
>
-- 
Wang Hai


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-10-26 12:17 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-26 11:25 [PATCH net] usbnet: fix error return code in usbnet_probe() Wang Hai
2021-10-26 11:54 ` Johan Hovold
2021-10-26 12:17   ` wanghai (M)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).