2012-05-25 13:21:58

by tip-bot for Franck Bui-Huu

Subject: [PATCH 1/1] perf tools: fix thread_map__new_by_pid_str() memory leak in error path

namelist array (including its content) was not freed if we fail
to realloc a new 'threads' structure.

Signed-off-by: Franck Bui-Huu <[email protected]>
---
tools/perf/util/thread_map.c | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/tools/perf/util/thread_map.c b/tools/perf/util/thread_map.c
index 84d9bd78..9b5f856 100644
--- a/tools/perf/util/thread_map.c
+++ b/tools/perf/util/thread_map.c
@@ -188,28 +188,27 @@ static struct thread_map *thread_map__new_by_pid_str(const char *pid_str)
nt = realloc(threads, (sizeof(*threads) +
sizeof(pid_t) * total_tasks));
if (nt == NULL)
- goto out_free_threads;
+ goto out_free_namelist;

threads = nt;

- if (threads) {
- for (i = 0; i < items; i++)
- threads->map[j++] = atoi(namelist[i]->d_name);
- threads->nr = total_tasks;
- }
-
- for (i = 0; i < items; i++)
+ for (i = 0; i < items; i++) {
+ threads->map[j++] = atoi(namelist[i]->d_name);
free(namelist[i]);
+ }
+ threads->nr = total_tasks;
free(namelist);
-
- if (!threads)
- break;
}

out:
strlist__delete(slist);
return threads;

+out_free_namelist:
+ for (i = 0; i < items; i++)
+ free(namelist[i]);
+ free(namelist);
+
out_free_threads:
free(threads);
threads = NULL;
--
1.7.7.4

2012-05-25 14:40:40

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH 1/1] perf tools: fix thread_map__new_by_pid_str() memory leak in error path

Em Fri, May 25, 2012 at 03:21:49PM +0200, Franck Bui-Huu escreveu:
> namelist array (including its content) was not freed if we fail
> to realloc a new 'threads' structure.
>
> Signed-off-by: Franck Bui-Huu <[email protected]>

Thanks, applied.

2012-05-30 07:44:50

by tip-bot for Franck Bui-Huu

Subject: [tip:perf/urgent] perf tools: fix thread_map__new_by_pid_str() memory leak in error path

Commit-ID: e8cdd947776300f962d5b699c34087af45a8aea7
Gitweb: http://git.kernel.org/tip/e8cdd947776300f962d5b699c34087af45a8aea7
Author: Franck Bui-Huu <[email protected]>
AuthorDate: Fri, 25 May 2012 15:21:49 +0200
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Fri, 25 May 2012 11:40:59 -0300

perf tools: fix thread_map__new_by_pid_str() memory leak in error path

The namelist array (including its content) was not freed if we fail to
realloc a new 'threads' structure.

Signed-off-by: Franck Bui-Huu <[email protected]>
Cc: David Ahern <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/util/thread_map.c | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/tools/perf/util/thread_map.c b/tools/perf/util/thread_map.c
index 84d9bd78..9b5f856 100644
--- a/tools/perf/util/thread_map.c
+++ b/tools/perf/util/thread_map.c
@@ -188,28 +188,27 @@ static struct thread_map *thread_map__new_by_pid_str(const char *pid_str)
nt = realloc(threads, (sizeof(*threads) +
sizeof(pid_t) * total_tasks));
if (nt == NULL)
- goto out_free_threads;
+ goto out_free_namelist;

threads = nt;

- if (threads) {
- for (i = 0; i < items; i++)
- threads->map[j++] = atoi(namelist[i]->d_name);
- threads->nr = total_tasks;
- }
-
- for (i = 0; i < items; i++)
+ for (i = 0; i < items; i++) {
+ threads->map[j++] = atoi(namelist[i]->d_name);
free(namelist[i]);
+ }
+ threads->nr = total_tasks;
free(namelist);
-
- if (!threads)
- break;
}

out:
strlist__delete(slist);
return threads;

+out_free_namelist:
+ for (i = 0; i < items; i++)
+ free(namelist[i]);
+ free(namelist);
+
out_free_threads:
free(threads);
threads = NULL;