[PATCH iproute2 0/2] dcb: some misc fixes

[PATCH iproute2 0/2] dcb: some misc fixes

[Andrea Claudi]

This series fixes two issues on dcb code:
- patch 1 fixes an incorrect return value in dcb_cmd_app_show() if an
  incorrect argument is provided;
- patch 2 is a trivial fix for a memory leak when "dcb help" is
  executed.

Andrea Claudi (2):
  dcb: fix return value on dcb_cmd_app_show
  dcb: fix memory leak

 dcb/dcb.c     | 3 ++-
 dcb/dcb_app.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

-- 
2.30.2

[PATCH iproute2 1/2] dcb: fix return value on dcb_cmd_app_show

[Andrea Claudi]

dcb_cmd_app_show() is supposed to return EINVAL if an incorrect argument
is provided.

Fixes: 8e9bed1493f5 ("dcb: Add a subtool for the DCB APP object")
Signed-off-by: Andrea Claudi <aclaudi@redhat.com>
---
 dcb/dcb_app.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dcb/dcb_app.c b/dcb/dcb_app.c
index c4816bc2..28f40614 100644
--- a/dcb/dcb_app.c
+++ b/dcb/dcb_app.c
@@ -667,7 +667,7 @@ static int dcb_cmd_app_show(struct dcb *dcb, const char *dev, int argc, char **a
 out:
 	close_json_object();
 	dcb_app_table_fini(&tab);
-	return 0;
+	return ret;
 }
 
 static int dcb_cmd_app_flush(struct dcb *dcb, const char *dev, int argc, char **argv)
-- 
2.30.2

Re: [PATCH iproute2 1/2] dcb: fix return value on dcb_cmd_app_show

[Petr Machata]

Andrea Claudi <aclaudi@redhat.com> writes:

> dcb_cmd_app_show() is supposed to return EINVAL if an incorrect argument
> is provided.
>
> Fixes: 8e9bed1493f5 ("dcb: Add a subtool for the DCB APP object")
> Signed-off-by: Andrea Claudi <aclaudi@redhat.com>
> ---
>  dcb/dcb_app.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/dcb/dcb_app.c b/dcb/dcb_app.c
> index c4816bc2..28f40614 100644
> --- a/dcb/dcb_app.c
> +++ b/dcb/dcb_app.c
> @@ -667,7 +667,7 @@ static int dcb_cmd_app_show(struct dcb *dcb, const char *dev, int argc, char **a
>  out:
>  	close_json_object();
>  	dcb_app_table_fini(&tab);
> -	return 0;
> +	return ret;
>  }
>  
>  static int dcb_cmd_app_flush(struct dcb *dcb, const char *dev, int argc, char **argv)

Nice catch. Looks good,

Reviewed-by: Petr Machata <me@pmachata.org>

Re: [PATCH iproute2 1/2] dcb: fix return value on dcb_cmd_app_show

[David Ahern]

On 5/1/21 10:39 AM, Andrea Claudi wrote:
> dcb_cmd_app_show() is supposed to return EINVAL if an incorrect argument
> is provided.
> 
> Fixes: 8e9bed1493f5 ("dcb: Add a subtool for the DCB APP object")
> Signed-off-by: Andrea Claudi <aclaudi@redhat.com>
> ---
>  dcb/dcb_app.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 

applied both

[PATCH iproute2 2/2] dcb: fix memory leak

[Andrea Claudi]

main() dinamically allocates dcb, but when dcb_help() is called it
returns without freeing it.

Fix this using a goto, as it is already done in the same function.

Fixes: 67033d1c1c8a ("Add skeleton of a new tool, dcb")
Signed-off-by: Andrea Claudi <aclaudi@redhat.com>
---
 dcb/dcb.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dcb/dcb.c b/dcb/dcb.c
index 64a9ef02..696f00e4 100644
--- a/dcb/dcb.c
+++ b/dcb/dcb.c
@@ -571,7 +571,8 @@ int main(int argc, char **argv)
 			break;
 		case 'h':
 			dcb_help();
-			return 0;
+			ret = EXIT_SUCCESS;
+			goto dcb_free;
 		default:
 			fprintf(stderr, "Unknown option.\n");
 			dcb_help();
-- 
2.30.2

Re: [PATCH iproute2 2/2] dcb: fix memory leak

[Petr Machata]

Andrea Claudi <aclaudi@redhat.com> writes:

> main() dinamically allocates dcb, but when dcb_help() is called it
> returns without freeing it.
>
> Fix this using a goto, as it is already done in the same function.
>
> Fixes: 67033d1c1c8a ("Add skeleton of a new tool, dcb")
> Signed-off-by: Andrea Claudi <aclaudi@redhat.com>

Thanks!

Reviewed-by: Petr Machata <me@pmachata.org>

Re: [PATCH iproute2 0/2] dcb: some misc fixes

[David Ahern]

On 5/1/21 10:39 AM, Andrea Claudi wrote:
> This series fixes two issues on dcb code:
> - patch 1 fixes an incorrect return value in dcb_cmd_app_show() if an
>   incorrect argument is provided;
> - patch 2 is a trivial fix for a memory leak when "dcb help" is
>   executed.
> 
> Andrea Claudi (2):
>   dcb: fix return value on dcb_cmd_app_show
>   dcb: fix memory leak
> 
>  dcb/dcb.c     | 3 ++-
>  dcb/dcb_app.c | 2 +-
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 

Always cc author of Fixes commit