usbip: tools: update return status when failed

[PATCH] usbip: tools: update return status when failed

Posted by Zongmin Zhou 1 year, 3 months ago

From: Zongmin Zhou <zhouzongmin@kylinos.cn>

Have to set "ret" before return when found a invalid port.

Signed-off-by: Zongmin Zhou <zhouzongmin@kylinos.cn>
---
 tools/usb/usbip/src/usbip_detach.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/usb/usbip/src/usbip_detach.c b/tools/usb/usbip/src/usbip_detach.c
index b29101986b5a..6b78d4a81e95 100644
--- a/tools/usb/usbip/src/usbip_detach.c
+++ b/tools/usb/usbip/src/usbip_detach.c
@@ -68,6 +68,7 @@ static int detach_port(char *port)
 	}
 
 	if (!found) {
+		ret = -1;
 		err("Invalid port %s > maxports %d",
 			port, vhci_driver->nports);
 		goto call_driver_close;
-- 
2.34.1

Re: [PATCH] usbip: tools: update return status when failed

Posted by Shuah Khan 1 year, 3 months ago

On 10/22/24 00:48, Zongmin Zhou wrote:
> From: Zongmin Zhou <zhouzongmin@kylinos.cn>

Update the short log to clearly indicate that this
is a fix:

usbip: tools: Fix detach_port() invalid port error path

> 
> Have to set "ret" before return when found a invalid port.

Give more details that detach_port() doesn't return error
when detach is attempted on an invalid port.

This is a fix for 40ecdeb1a1875
usbip: usbip_detach: fix to check for invalid ports

Add Fixes tag

This patch can be tagged for stable.

> 
> Signed-off-by: Zongmin Zhou <zhouzongmin@kylinos.cn>
> ---
>   tools/usb/usbip/src/usbip_detach.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/tools/usb/usbip/src/usbip_detach.c b/tools/usb/usbip/src/usbip_detach.c
> index b29101986b5a..6b78d4a81e95 100644
> --- a/tools/usb/usbip/src/usbip_detach.c
> +++ b/tools/usb/usbip/src/usbip_detach.c
> @@ -68,6 +68,7 @@ static int detach_port(char *port)
>   	}
>   
>   	if (!found) {
> +		ret = -1;
>   		err("Invalid port %s > maxports %d",
>   			port, vhci_driver->nports);
>   		goto call_driver_close;

With these changes:

Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>

thanks,
-- Shuah

[PATCH v2] usbip: tools: Fix detach_port() invalid port error path

Posted by Zongmin Zhou 1 year, 3 months ago

From: Zongmin Zhou <zhouzongmin@kylinos.cn>

The detach_port() doesn't return error
when detach is attempted on an invalid port.

Fixes: 40ecdeb1a187 ("usbip: usbip_detach: fix to check for invalid ports")
Cc: stable@vger.kernel.org
Reviewed-by: Hongren Zheng <i@zenithal.me>
Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>
Signed-off-by: Zongmin Zhou <zhouzongmin@kylinos.cn>
---
 tools/usb/usbip/src/usbip_detach.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/usb/usbip/src/usbip_detach.c b/tools/usb/usbip/src/usbip_detach.c
index b29101986b5a..6b78d4a81e95 100644
--- a/tools/usb/usbip/src/usbip_detach.c
+++ b/tools/usb/usbip/src/usbip_detach.c
@@ -68,6 +68,7 @@ static int detach_port(char *port)
 	}
 
 	if (!found) {
+		ret = -1;
 		err("Invalid port %s > maxports %d",
 			port, vhci_driver->nports);
 		goto call_driver_close;
-- 
2.34.1

Re: [PATCH v2] usbip: tools: Fix detach_port() invalid port error path

Posted by Shuah Khan 1 year, 3 months ago

On 10/23/24 20:27, Zongmin Zhou wrote:
> From: Zongmin Zhou <zhouzongmin@kylinos.cn>
> 
> The detach_port() doesn't return error
> when detach is attempted on an invalid port.
> 
> Fixes: 40ecdeb1a187 ("usbip: usbip_detach: fix to check for invalid ports")
> Cc: stable@vger.kernel.org
> Reviewed-by: Hongren Zheng <i@zenithal.me>
> Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>
> Signed-off-by: Zongmin Zhou <zhouzongmin@kylinos.cn>
> ---
>   tools/usb/usbip/src/usbip_detach.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/tools/usb/usbip/src/usbip_detach.c b/tools/usb/usbip/src/usbip_detach.c
> index b29101986b5a..6b78d4a81e95 100644
> --- a/tools/usb/usbip/src/usbip_detach.c
> +++ b/tools/usb/usbip/src/usbip_detach.c
> @@ -68,6 +68,7 @@ static int detach_port(char *port)
>   	}
>   
>   	if (!found) {
> +		ret = -1;
>   		err("Invalid port %s > maxports %d",
>   			port, vhci_driver->nports);
>   		goto call_driver_close;

Thank you.

Greg, Please pick this up.

thanks,
-- Shuah

Re: [PATCH] usbip: tools: update return status when failed

Posted by Hongren Zheng 1 year, 3 months ago

On Tue, Oct 22, 2024 at 02:48:56PM +0800, Zongmin Zhou wrote:
> From: Zongmin Zhou <zhouzongmin@kylinos.cn>
> 
> Have to set "ret" before return when found a invalid port.
> 
> Signed-off-by: Zongmin Zhou <zhouzongmin@kylinos.cn>

Reviewed-by: Hongren Zheng <i@zenithal.me>

> ---
>  tools/usb/usbip/src/usbip_detach.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/tools/usb/usbip/src/usbip_detach.c b/tools/usb/usbip/src/usbip_detach.c
> index b29101986b5a..6b78d4a81e95 100644
> --- a/tools/usb/usbip/src/usbip_detach.c
> +++ b/tools/usb/usbip/src/usbip_detach.c
> @@ -68,6 +68,7 @@ static int detach_port(char *port)
>  	}
>  
>  	if (!found) {
> +		ret = -1;
>  		err("Invalid port %s > maxports %d",
>  			port, vhci_driver->nports);
>  		goto call_driver_close;
> -- 
> 2.34.1
>

Re: [PATCH] usbip: tools: update return status when failed

Posted by Shuah Khan 1 year, 1 month ago

On 10/22/24 01:58, Hongren Zheng wrote:
> On Tue, Oct 22, 2024 at 02:48:56PM +0800, Zongmin Zhou wrote:
>> From: Zongmin Zhou <zhouzongmin@kylinos.cn>
>>
>> Have to set "ret" before return when found a invalid port.
>>
>> Signed-off-by: Zongmin Zhou <zhouzongmin@kylinos.cn>
> 
> Reviewed-by: Hongren Zheng <i@zenithal.me>
> 
>> ---
>>   tools/usb/usbip/src/usbip_detach.c | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/tools/usb/usbip/src/usbip_detach.c b/tools/usb/usbip/src/usbip_detach.c
>> index b29101986b5a..6b78d4a81e95 100644
>> --- a/tools/usb/usbip/src/usbip_detach.c
>> +++ b/tools/usb/usbip/src/usbip_detach.c
>> @@ -68,6 +68,7 @@ static int detach_port(char *port)
>>   	}
>>   
>>   	if (!found) {
>> +		ret = -1;
>>   		err("Invalid port %s > maxports %d",
>>   			port, vhci_driver->nports);
>>   		goto call_driver_close;
>> -- 
>> 2.34.1
>>

Looks like I missed this one. Sorry for the delay on this.

Acked-by: Shuah Khan <skhan@linuxfoundation.org>

Greg, Please pick this one as well.

thanks,
-- Shuah