2021-08-20 11:37:28

by Riccardo Mancini

Subject: [PATCH] perf tests: dlfilter: free desc and long_desc in check_filter_desc

In dlfilter-test, the function check_filter_desc calls get_filter_desc
which allocates desc and long_desc.
However, these variables are never deallocated.

This patch adds the missing frees.

Cc: Adrian Hunter <[email protected]>
Fixes: 9f9c9a8de2d5e96c ("perf tests: Add dlfilter test")
Signed-off-by: Riccardo Mancini <[email protected]>
---
tools/perf/tests/dlfilter-test.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tools/perf/tests/dlfilter-test.c b/tools/perf/tests/dlfilter-test.c
index 7eba7955d53154e1..bc03b5df6828d6fa 100644
--- a/tools/perf/tests/dlfilter-test.c
+++ b/tools/perf/tests/dlfilter-test.c
@@ -239,15 +239,20 @@ static int get_dlfilters_path(char *buf, size_t sz)

static int check_filter_desc(struct test_data *td)
{
- char *long_desc;
- char *desc;
+ char *long_desc = NULL;
+ char *desc = NULL;
+ int ret;

if (get_filter_desc(td->dlfilters, "dlfilter-test-api-v0.so", &desc, &long_desc) &&
long_desc && !strcmp(long_desc, "Filter used by the 'dlfilter C API' perf test") &&
desc && !strcmp(desc, "dlfilter to test v0 C API"))
- return 0;
+ ret = 0;
+ else
+ ret = -1;

- return -1;
+ free(desc);
+ free(long_desc);
+ return ret;
}

static int get_ip_addr(struct test_data *td)
--
2.31.1

2021-08-20 12:33:14

by Adrian Hunter

Subject: Re: [PATCH] perf tests: dlfilter: free desc and long_desc in check_filter_desc

On 20/08/21 2:31 pm, Riccardo Mancini wrote:
> In dlfilter-test, the function check_filter_desc calls get_filter_desc
> which allocates desc and long_desc.
> However, these variables are never deallocated.
>
> This patch adds the missing frees.
>
> Cc: Adrian Hunter <[email protected]>
> Fixes: 9f9c9a8de2d5e96c ("perf tests: Add dlfilter test")
> Signed-off-by: Riccardo Mancini <[email protected]>

Acked-by: Adrian Hunter <[email protected]>

> ---
> tools/perf/tests/dlfilter-test.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/tools/perf/tests/dlfilter-test.c b/tools/perf/tests/dlfilter-test.c
> index 7eba7955d53154e1..bc03b5df6828d6fa 100644
> --- a/tools/perf/tests/dlfilter-test.c
> +++ b/tools/perf/tests/dlfilter-test.c
> @@ -239,15 +239,20 @@ static int get_dlfilters_path(char *buf, size_t sz)
>
> static int check_filter_desc(struct test_data *td)
> {
> - char *long_desc;
> - char *desc;
> + char *long_desc = NULL;
> + char *desc = NULL;
> + int ret;
>
> if (get_filter_desc(td->dlfilters, "dlfilter-test-api-v0.so", &desc, &long_desc) &&
> long_desc && !strcmp(long_desc, "Filter used by the 'dlfilter C API' perf test") &&
> desc && !strcmp(desc, "dlfilter to test v0 C API"))
> - return 0;
> + ret = 0;
> + else
> + ret = -1;
>
> - return -1;
> + free(desc);
> + free(long_desc);
> + return ret;
> }
>
> static int get_ip_addr(struct test_data *td)
>

2021-08-20 14:20:25

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH] perf tests: dlfilter: free desc and long_desc in check_filter_desc

Em Fri, Aug 20, 2021 at 03:29:39PM +0300, Adrian Hunter escreveu:
> On 20/08/21 2:31 pm, Riccardo Mancini wrote:
> > In dlfilter-test, the function check_filter_desc calls get_filter_desc
> > which allocates desc and long_desc.
> > However, these variables are never deallocated.
> >
> > This patch adds the missing frees.
> >
> > Cc: Adrian Hunter <[email protected]>
> > Fixes: 9f9c9a8de2d5e96c ("perf tests: Add dlfilter test")
> > Signed-off-by: Riccardo Mancini <[email protected]>
>
> Acked-by: Adrian Hunter <[email protected]>

Thanks, applied.

- Arnaldo