From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02322C3A5A0 for ; Mon, 19 Aug 2019 14:15:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D289820843 for ; Mon, 19 Aug 2019 14:15:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726959AbfHSOPp (ORCPT ); Mon, 19 Aug 2019 10:15:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11932 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726751AbfHSOPp (ORCPT ); Mon, 19 Aug 2019 10:15:45 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BD5433A20F; Mon, 19 Aug 2019 14:15:44 +0000 (UTC) Received: from krava (unknown [10.43.17.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 07983831A3; Mon, 19 Aug 2019 14:15:40 +0000 (UTC) Date: Mon, 19 Aug 2019 16:15:40 +0200 From: Jiri Olsa To: Jack Wang Cc: Sasha Levin , linux-kernel@vger.kernel.org, stable@vger.kernel.org, Vince Weaver , Alexander Shishkin , Namhyung Kim , Peter Zijlstra , Arnaldo Carvalho de Melo Subject: Re: [PATCH AUTOSEL 4.4 04/14] perf header: Fix divide by zero error if f_header.attr_size==0 Message-ID: <20190819141540.GC9637@krava> References: <20190806213749.20689-1-sashal@kernel.org> <20190806213749.20689-4-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.12.1 (2019-06-15) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 19 Aug 2019 14:15:45 +0000 (UTC) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Mon, Aug 19, 2019 at 02:07:53PM +0200, Jack Wang wrote: > Sasha Levin 于2019年8月6日周二 下午11:39写道： > > > > From: Vince Weaver > > > > [ Upstream commit 7622236ceb167aa3857395f9bdaf871442aa467e ] > > > > So I have been having lots of trouble with hand-crafted perf.data files > > causing segfaults and the like, so I have started fuzzing the perf tool. > > > > First issue found: > > > > If f_header.attr_size is 0 in the perf.data file, then perf will crash > > with a divide-by-zero error. > > > > Committer note: > > > > Added a pr_err() to tell the user why the command failed. > > > > Signed-off-by: Vince Weaver > > Cc: Alexander Shishkin > > Cc: Jiri Olsa > > Cc: Namhyung Kim > > Cc: Peter Zijlstra > > Link: http://lkml.kernel.org/r/alpine.DEB.2.21.1907231100440.14532@macbook-air > > Signed-off-by: Arnaldo Carvalho de Melo > > Signed-off-by: Sasha Levin > > --- > > tools/perf/util/header.c | 7 +++++++ > > 1 file changed, 7 insertions(+) > > > Hi all, > > This on cause build failure when I rebased to 4.14.140-rc1 in stable-rc tree. > > util/header.c: In function 'perf_session__read_header': > util/header.c:2907:10: error: 'data' undeclared (first use in this > function); did you mean 'dots'? > data->file.path); > Should be fixed by: > --- a/tools/perf/util/header.c > +++ b/tools/perf/util/header.c > @@ -2904,7 +2904,7 @@ int perf_session__read_header(struct > perf_session *session) > if (f_header.attr_size == 0) { > pr_err("ERROR: The %s file's attr size field is 0 > which is unexpected.\n" > "Was the 'perf record' command properly terminated?\n", > - data->file.path); > + file->path); > return -EINVAL; seems as good fix for 4.4, we took following commit in 4.15: eae8ad8042d8 perf tools: Add struct perf_data_file that added the file layer jirka > > Regards, > Jack Wang > > > diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c > > index 304f5d7101436..0102dd46fb6da 100644 > > --- a/tools/perf/util/header.c > > +++ b/tools/perf/util/header.c > > @@ -2591,6 +2591,13 @@ int perf_session__read_header(struct perf_session *session) > > file->path); > > } > > > > + if (f_header.attr_size == 0) { > > + pr_err("ERROR: The %s file's attr size field is 0 which is unexpected.\n" > > + "Was the 'perf record' command properly terminated?\n", > > + data->file.path); > > + return -EINVAL; > > + } > > + > > nr_attrs = f_header.attrs.size / f_header.attr_size; > > lseek(fd, f_header.attrs.offset, SEEK_SET); > > > > -- > > 2.20.1 > >