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 S1422950AbbD2MN4 (ORCPT <rfc822;w@1wt.eu>);
	Wed, 29 Apr 2015 08:13:56 -0400
Received: from mga09.intel.com ([134.134.136.24]:7531 "EHLO mga09.intel.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1422673AbbD2MNw (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Wed, 29 Apr 2015 08:13:52 -0400
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.11,670,1422950400"; 
   d="scan'208";a="717733627"
Message-ID: <5540CA74.9030508@intel.com>
Date: Wed, 29 Apr 2015 15:11:32 +0300
From: Adrian Hunter <adrian.hunter@intel.com>
Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki,
 Business Identity Code: 0357606 - 4, Domiciled in Helsinki 
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.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>,
        Stephane Eranian <eranian@google.com>
Subject: Re: [PATCH V3 04/25] perf tools: Add AUX area tracing index
References: <1429903807-20559-1-git-send-email-adrian.hunter@intel.com> <1429903807-20559-5-git-send-email-adrian.hunter@intel.com> <20150428123230.GB22258@krava.redhat.com>
In-Reply-To: <20150428123230.GB22258@krava.redhat.com>
Content-Type: text/plain; charset=windows-1252
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 28/04/15 15:32, Jiri Olsa wrote:
> On Fri, Apr 24, 2015 at 10:29:46PM +0300, Adrian Hunter wrote:
> 
> SNIP
> 
>> --- a/tools/perf/util/auxtrace.c
>> +++ b/tools/perf/util/auxtrace.c
>> @@ -344,6 +344,33 @@ out_err:
>>  	return err;
>>  }
>>  
>> +static int auxtrace_queues__add_indexed_event(struct auxtrace_queues *queues,
>> +					      struct perf_session *session,
>> +					      off_t file_offset, size_t sz)
>> +{
>> +	union perf_event *event;
>> +	int err;
>> +	char buf[PERF_SAMPLE_MAX_SIZE];
>> +
>> +	err = perf_session__peek_event(session, file_offset, buf,
>> +				       PERF_SAMPLE_MAX_SIZE, &event, NULL);
>> +	if (err)
>> +		return err;
>> +
>> +	if (event->header.type == PERF_RECORD_AUXTRACE) {
>> +		if (event->header.size != sizeof(struct auxtrace_event) ||
>> +		    event->header.size != sz) {
>> +			err = -EINVAL;
> 
> getting lost in here
> 
> as per auxtrace_mmap__read it looks like we store PERF_RECORD_AUXTRACE event with:
> 	ev.auxtrace.header.size = sizeof(ev.auxtrace);
> 
> and it's followed with more data with size:
> 	ev.auxtrace.size = size + padding;
> 
> so why the check for 'event->header.size != sz' ?

It checks the consistency of the file structure.

But it seems to me that the previous check could be:

	event->header.size < sizeof(struct auxtrace_event)

which would allow for the event being made bigger in a backward compatible way.

> 
> jirka
> 
>> +			goto out;
>> +		}
>> +		file_offset += event->header.size;
>> +		err = auxtrace_queues__add_event(queues, session, event,
>> +						 file_offset, NULL);
>> +	}
>> +out:
>> +	return err;
>> +}
> 
> SNIP
> 
>