From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S965130AbaGPO0p (ORCPT <rfc822;w@1wt.eu>);
	Wed, 16 Jul 2014 10:26:45 -0400
Received: from mga11.intel.com ([192.55.52.93]:53889 "EHLO mga11.intel.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S934391AbaGPO0n (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Wed, 16 Jul 2014 10:26:43 -0400
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.01,672,1400050800"; 
   d="scan'208";a="562679613"
Message-ID: <53C68B9F.9010508@intel.com>
Date: Wed, 16 Jul 2014 17:26:39 +0300
From: Adrian Hunter <adrian.hunter@intel.com>
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0
MIME-Version: 1.0
To: Jiri Olsa <jolsa@redhat.com>
CC: Arnaldo Carvalho de Melo <acme@kernel.org>,
        Peter Zijlstra <peterz@infradead.org>, linux-kernel@vger.kernel.org,
        David Ahern <dsahern@gmail.com>,
        Frederic Weisbecker <fweisbec@gmail.com>,
        Namhyung Kim <namhyung@gmail.com>, Paul Mackerras <paulus@samba.org>,
        Stephane Eranian <eranian@google.com>
Subject: Re: [PATCH 12/41] perf tools: Fix leak of 'struct thread' on error
 path
References: <1405332185-4050-1-git-send-email-adrian.hunter@intel.com> <1405332185-4050-13-git-send-email-adrian.hunter@intel.com> <20140716140202.GB9441@krava.redhat.com>
In-Reply-To: <20140716140202.GB9441@krava.redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 16/07/2014 5:02 p.m., Jiri Olsa wrote:
> 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@intel.com>
>> ---
>>   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

On the error path the thread does not yet have an mg.