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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 6B82AC433FF for ; Wed, 14 Aug 2019 17:25:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 442CF206C1 for ; Wed, 14 Aug 2019 17:25:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565803501; bh=Qq5prsGx8ERuiCyQ2VqquS9Mn8rR3/5c2u5GfHM+YEw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=khXL8OjMO0HsLfZEYqzsIm1PPCNrN+5RmHzd0JNu7msH0rccAlzZf7MEuwQsdg4D2 5RV5JiCdSPwxwHROI+pm9JTOT7QQSL1xBfjRqP7GN9NuOsnwqMxxzuupgAg9Cf2N/q r/i2e9oCt+M4y8+hP10fqN8/MXWG3uC3H3yuaIz4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729552AbfHNRGG (ORCPT ); Wed, 14 Aug 2019 13:06:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:55108 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729090AbfHNRGD (ORCPT ); Wed, 14 Aug 2019 13:06:03 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D050A214DA; Wed, 14 Aug 2019 17:06:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565802363; bh=Qq5prsGx8ERuiCyQ2VqquS9Mn8rR3/5c2u5GfHM+YEw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P2aL0mfGcPbDCiDHmqv+YEOAFJmydH2GkFI2U3XQ6p9pv2ofENEn4bhOOfKSNapUg HJJUoY0nxN/H/cab4aaTEgjqpBgFh8usq0UPsHxqp5QOdvrEvGKz11CWIZM/ozOQvB 4uf/FOaQ/FYVUJh8pEDhi7JsJ4F2Nsr5bXCRMhfM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnaldo Carvalho de Melo , Jiri Olsa , Alexander Shishkin , David Carrillo-Cisneros , Kan Liang , Namhyung Kim , Peter Zijlstra , Song Liu , Sasha Levin Subject: [PATCH 5.2 097/144] perf tools: Fix proper buffer size for feature processing Date: Wed, 14 Aug 2019 19:00:53 +0200 Message-Id: <20190814165803.938843032@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190814165759.466811854@linuxfoundation.org> References: <20190814165759.466811854@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 79b2fe5e756163897175a8f57d66b26cd9befd59 ] After Song Liu's segfault fix for pipe mode, Arnaldo reported following error: # perf record -o - | perf script 0x514 [0x1ac]: failed to process type: 80 It's caused by wrong buffer size setup in feature processing, which makes cpu topology feature fail, because it's using buffer size to recognize its header version. Reported-by: Arnaldo Carvalho de Melo Signed-off-by: Jiri Olsa Tested-by: Arnaldo Carvalho de Melo Cc: Alexander Shishkin Cc: David Carrillo-Cisneros Cc: Kan Liang Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Song Liu Fixes: e9def1b2e74e ("perf tools: Add feature header record to pipe-mode") Link: http://lkml.kernel.org/r/20190715140426.32509-1-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index b82d4577d9694..e84b70be3fc11 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -3666,7 +3666,7 @@ int perf_event__process_feature(struct perf_session *session, return 0; ff.buf = (void *)fe->data; - ff.size = event->header.size - sizeof(event->header); + ff.size = event->header.size - sizeof(*fe); ff.ph = &session->header; if (feat_ops[feat].process(&ff, NULL)) -- 2.20.1