Re: [PATCH 12/41] perf tools: Fix leak of 'struct thread' on error path

[Jiri Olsa]

On Mon, Jul 14, 2014 at 01:02:36PM +0300, Adrian Hunter wrote:
> __machine__findnew_thread() creates a 'struct thread'
> but does not free it on the error path.
> 
> Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>
> ---
>  tools/perf/util/machine.c | 4 +++-
>  tools/perf/util/thread.c  | 6 ++++--
>  2 files changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
> index c1c5ca3..18eaf31 100644
> --- a/tools/perf/util/machine.c
> +++ b/tools/perf/util/machine.c
> @@ -349,8 +349,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;
> diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c
> index 149e417..b9a3ee4 100644
> --- a/tools/perf/util/thread.c
> +++ b/tools/perf/util/thread.c
> @@ -95,8 +95,10 @@ void thread__delete(struct thread *thread)
>  {
>  	struct comm *comm, *tmp;
>  
> -	map_groups__put(thread->mg);
> -	thread->mg = NULL;
> +	if (thread->mg) {
> +		map_groups__put(thread->mg);
> +		thread->mg = NULL;
> +	}

I dont think this is ^^^ needed..  each thread has ->mg defined

jirka
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/