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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 E28D4C433FF for ; Fri, 2 Aug 2019 13:24:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B5BA221773 for ; Fri, 2 Aug 2019 13:24:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564752253; bh=r3+BJ//iHepLd3Di42YVZF/Acb1UYp6c6vn7U9V1TXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IrFe40rMBrPwj2MGlN7fQMGoE+St0JMEXyGLW73iV8iI9550lL9FtfBASudMCwlYU QOSck6oMSA4hk23Yq1IBqzxSmc2hTWHAhDwnN3xEUjfQMuxby4VzLU5OSBFjHKKY5Q 6rXQ6sHL/mQSdhXFwPQsfQocwhWtlirOehAlHEqg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390943AbfHBNYM (ORCPT ); Fri, 2 Aug 2019 09:24:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:34516 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733300AbfHBNXz (ORCPT ); Fri, 2 Aug 2019 09:23:55 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9ADE521773; Fri, 2 Aug 2019 13:23:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564752234; bh=r3+BJ//iHepLd3Di42YVZF/Acb1UYp6c6vn7U9V1TXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CnmyR7GMMWmlMDsnEsSX//bxoyFyrp4FwpcXEXPsz7bVEf4vux9lvhWBF1G1Gjnse 8Ptz71WShv5rhc14BjuhaZHn+cnnHnzuyv8ISSMvAajTzsyOHs5vXOuUXwdmq0axUT 5koCOC3twxAXXQTFcM+n4ylfhdpZS/ki+vvN4Zo8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jiri Olsa , Arnaldo Carvalho de Melo , Alexander Shishkin , David Carrillo-Cisneros , Kan Liang , Namhyung Kim , Peter Zijlstra , Song Liu , Sasha Levin Subject: [PATCH AUTOSEL 4.19 27/42] perf tools: Fix proper buffer size for feature processing Date: Fri, 2 Aug 2019 09:22:47 -0400 Message-Id: <20190802132302.13537-27-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190802132302.13537-1-sashal@kernel.org> References: <20190802132302.13537-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiri Olsa [ 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 7f2e3b1c746c9..a94bd6850a0b2 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -3472,7 +3472,7 @@ int perf_event__process_feature(struct perf_tool *tool, 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