* [PATCH] perf test: add missing free for scandir-returned dirent entities
@ 2021-07-09 16:34 Riccardo Mancini
2021-07-09 18:21 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 2+ messages in thread
From: Riccardo Mancini @ 2021-07-09 16:34 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Namhyung Kim, Ian Rogers, Riccardo Mancini, Peter Zijlstra,
Ingo Molnar, Mark Rutland, Alexander Shishkin, Jiri Olsa,
Leo Yan, Remi Bernon, Fabian Hemmer, linux-perf-users,
linux-kernel
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.
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] perf test: add missing free for scandir-returned dirent entities
2021-07-09 16:34 [PATCH] perf test: add missing free for scandir-returned dirent entities Riccardo Mancini
@ 2021-07-09 18:21 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 2+ messages in thread
From: Arnaldo Carvalho de Melo @ 2021-07-09 18:21 UTC (permalink / raw)
To: Riccardo Mancini
Cc: Namhyung Kim, Ian Rogers, Peter Zijlstra, Ingo Molnar,
Mark Rutland, Alexander Shishkin, Jiri Olsa, Leo Yan,
Remi Bernon, Fabian Hemmer, linux-perf-users, linux-kernel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-09 18:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-09 16:34 [PATCH] perf test: add missing free for scandir-returned dirent entities Riccardo Mancini
2021-07-09 18:21 ` Arnaldo Carvalho de Melo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.