Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 9 Jul 2021 15:21:46 -0300
From:   Arnaldo Carvalho de Melo <acme@kernel.org>
To:     Riccardo Mancini <rickyman7@gmail.com>
Cc:     Namhyung Kim <namhyung@kernel.org>,
        Ian Rogers <irogers@google.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Ingo Molnar <mingo@redhat.com>,
        Mark Rutland <mark.rutland@arm.com>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Jiri Olsa <jolsa@redhat.com>, Leo Yan <leo.yan@linaro.org>,
        Remi Bernon <rbernon@codeweavers.com>,
        Fabian Hemmer <copy@copy.sh>, linux-perf-users@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] perf test: add missing free for scandir-returned dirent
 entities
Message-ID: <YOiTuvHKc5I9TzJe@kernel.org>
References: <20210709163454.672082-1-rickyman7@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20210709163454.672082-1-rickyman7@gmail.com>
Precedence: bulk

Em Fri, Jul 09, 2021 at 06:34:53PM +0200, Riccardo Mancini escreveu:
> ASan reported a memory leak for items of the entlist returned from scandir.
> In fact, scandir returns a malloc'd array of malloc'd dirents.
> This patch adds the missing (z)frees.

Hey, I thought you were pluging old leaks, this one was introduced
recently ;-) :-)

Thanks, applied!

- Arnaldo
 
> Fixes: da963834fe6975a1 ("perf test: Iterate over shell tests in alphabetical order")
> Signed-off-by: Riccardo Mancini <rickyman7@gmail.com>
> ---
>  tools/perf/tests/builtin-test.c | 15 +++++++++++----
>  1 file changed, 11 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
> index 41e3cf6bb66c68e8..5e6242576236325c 100644
> --- a/tools/perf/tests/builtin-test.c
> +++ b/tools/perf/tests/builtin-test.c
> @@ -26,6 +26,7 @@
>  #include <linux/kernel.h>
>  #include <linux/string.h>
>  #include <subcmd/exec-cmd.h>
> +#include <linux/zalloc.h>
>  
>  static bool dont_fork;
>  
> @@ -540,7 +541,7 @@ static int shell_tests__max_desc_width(void)
>  {
>  	struct dirent **entlist;
>  	struct dirent *ent;
> -	int n_dirs;
> +	int n_dirs, e;
>  	char path_dir[PATH_MAX];
>  	const char *path = shell_tests__dir(path_dir, sizeof(path_dir));
>  	int width = 0;
> @@ -564,8 +565,9 @@ static int shell_tests__max_desc_width(void)
>  		}
>  	}
>  
> +	for (e = 0; e < n_dirs; e++)
> +		zfree(&entlist[e]);
>  	free(entlist);
> -
>  	return width;
>  }
>  
> @@ -596,7 +598,7 @@ static int run_shell_tests(int argc, const char *argv[], int i, int width)
>  {
>  	struct dirent **entlist;
>  	struct dirent *ent;
> -	int n_dirs;
> +	int n_dirs, e;
>  	char path_dir[PATH_MAX];
>  	struct shell_test st = {
>  		.dir = shell_tests__dir(path_dir, sizeof(path_dir)),
> @@ -629,6 +631,8 @@ static int run_shell_tests(int argc, const char *argv[], int i, int width)
>  		test_and_print(&test, false, -1);
>  	}
>  
> +	for (e = 0; e < n_dirs; e++)
> +		zfree(&entlist[e]);
>  	free(entlist);
>  	return 0;
>  }
> @@ -730,7 +734,7 @@ static int perf_test__list_shell(int argc, const char **argv, int i)
>  {
>  	struct dirent **entlist;
>  	struct dirent *ent;
> -	int n_dirs;
> +	int n_dirs, e;
>  	char path_dir[PATH_MAX];
>  	const char *path = shell_tests__dir(path_dir, sizeof(path_dir));
>  
> @@ -752,8 +756,11 @@ static int perf_test__list_shell(int argc, const char **argv, int i)
>  			continue;
>  
>  		pr_info("%2d: %s\n", i, t.desc);
> +
>  	}
>  
> +	for (e = 0; e < n_dirs; e++)
> +		zfree(&entlist[e]);
>  	free(entlist);
>  	return 0;
>  }
> -- 
> 2.23.0
> 

-- 

- Arnaldo