Messages in this thread Patch in this message | | | Date | Thu, 17 Jul 2014 21:27:20 -0700 | From | tip-bot for Adrian Hunter <> | Subject | [tip:perf/core] perf machine: Fix leak of 'struct thread' on error path |
| |
Commit-ID: 418029b7324f8b90ac1dfbc8a44555d6905be761 Gitweb: http://git.kernel.org/tip/418029b7324f8b90ac1dfbc8a44555d6905be761 Author: Adrian Hunter <adrian.hunter@intel.com> AuthorDate: Wed, 16 Jul 2014 10:19:44 +0300 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Thu, 17 Jul 2014 10:34:07 -0300
perf machine: Fix leak of 'struct thread' on error path
__machine__findnew_thread() creates a 'struct thread' but does not free it on the error path. Fix it.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Namhyung Kim <namhyung@gmail.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/r/1405495184-20441-3-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/util/machine.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 5484fa4..93c8b6f 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -370,8 +370,10 @@ static struct thread *__machine__findnew_thread(struct machine *machine, * within thread__init_map_groups to find the thread * leader and that would screwed the rb tree. */ - if (thread__init_map_groups(th, machine)) + if (thread__init_map_groups(th, machine)) { + thread__delete(th); return NULL; + } } return th;
| |