From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnaldo Carvalho de Melo Subject: Re: [PATCH] perf inject: correct event attribute sizes Date: Tue, 1 Sep 2020 14:26:08 -0300 Message-ID: <20200901172608.GE1424523@kernel.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: Al Grant Cc: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com List-Id: linux-perf-users.vger.kernel.org Em Wed, Aug 26, 2020 at 10:42:04AM +0100, Al Grant escreveu: > When perf inject reads a perf.data file from an older version of perf, > it writes event attributes into the output with the original size field, > but lays them out as if they had the size currently used. Readers see > a corrupt file. Update the size field to match the layout. > > From: Denis Nikitin > Signed-off-by: Al Grant Ok, so the author is Denis, has he provided his Signed-off-by? - Arnaldo > tools/perf/util/header.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c > index 9cf4efdcbbbd..762eb94bd532 100644 > --- a/tools/perf/util/header.c > +++ b/tools/perf/util/header.c > @@ -3326,6 +3326,14 @@ int perf_session__write_header(struct > perf_session *session, > attr_offset = lseek(ff.fd, 0, SEEK_CUR); > > evlist__for_each_entry(evlist, evsel) { > + if (evsel->core.attr.size < sizeof(evsel->core.attr)) { > + /* > + * We are likely in "perf inject" and have read + > * from an older file. Update attr size so that > + * reader gets the right offset to the ids. > + */ > + evsel->core.attr.size = sizeof(evsel->core.attr); > + } > f_attr = (struct perf_file_attr){ > .attr = evsel->core.attr, > .ids = { -- - Arnaldo