[PATCH] staging: greybus: fix an error handling bug in gb_svc_hello()

[PATCH] staging: greybus: fix an error handling bug in gb_svc_hello()

[Dan Carpenter]

Cleanup if gb_svc_queue_deferred_request() fails.

Fixes: ee2f2074fdb2 ("greybus: svc: reconfig APBridgeA-Switch link to handle required load")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
From static analysis.  Not tested.

 drivers/greybus/svc.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/greybus/svc.c b/drivers/greybus/svc.c
index ce7740ef449b..b19651048081 100644
--- a/drivers/greybus/svc.c
+++ b/drivers/greybus/svc.c
@@ -866,8 +866,14 @@ static int gb_svc_hello(struct gb_operation *op)
 
 	gb_svc_debugfs_init(svc);
 
-	return gb_svc_queue_deferred_request(op);
+	ret = gb_svc_queue_deferred_request(op);
+	if (ret)
+		goto remove_debugfs;
+
+	return 0;
 
+remove_debugfs:
+	gb_svc_debugfs_exit(svc);
 err_unregister_device:
 	gb_svc_watchdog_destroy(svc);
 	device_del(&svc->dev);
-- 
2.20.1

Re: [PATCH] staging: greybus: fix an error handling bug in gb_svc_hello()

[Johan Hovold]

On Wed, Feb 02, 2022 at 10:20:16AM +0300, Dan Carpenter wrote:
> Cleanup if gb_svc_queue_deferred_request() fails.
> 
> Fixes: ee2f2074fdb2 ("greybus: svc: reconfig APBridgeA-Switch link to handle required load")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> From static analysis.  Not tested.

Look correct. Thanks, Dan.

This part of Greybus no longer lives in staging and the prefix should be

	greybus: svc:

I'd also prefer to see all error labels use an err_ prefix consistently.

When looking at this code I found another bug so I'll fix up the above
nits and send a series with both fixes as there will be a dependency.

>  drivers/greybus/svc.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/greybus/svc.c b/drivers/greybus/svc.c
> index ce7740ef449b..b19651048081 100644
> --- a/drivers/greybus/svc.c
> +++ b/drivers/greybus/svc.c
> @@ -866,8 +866,14 @@ static int gb_svc_hello(struct gb_operation *op)
>  
>  	gb_svc_debugfs_init(svc);
>  
> -	return gb_svc_queue_deferred_request(op);
> +	ret = gb_svc_queue_deferred_request(op);
> +	if (ret)
> +		goto remove_debugfs;
> +
> +	return 0;
>  
> +remove_debugfs:
> +	gb_svc_debugfs_exit(svc);
>  err_unregister_device:
>  	gb_svc_watchdog_destroy(svc);
>  	device_del(&svc->dev);

Johan