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 88243CA9EAF for ; Mon, 21 Oct 2019 13:38:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 50C182173B for ; Mon, 21 Oct 2019 13:38:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571665134; bh=Zn3tuprfOPLKAmr9XdPjlU6pkfo9Svn84N6ztGvboqE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=A4gF9jJKou7k4PXhyzgP2vyjJRjBrI/bL1TffhUYxU0l6s5PW8DeZoOYMzvzZnBoq 1NDHq+CCa0HR09Wfa5ra9eu3cpTbVeZSE6H+WYzk4PLsXk5XoBBSRAwbnAIbaY2VEH 6GB8y4LOg85YpCWKYPT7KbmWWY8Pq0kK8WkFxrUI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729089AbfJUNix (ORCPT ); Mon, 21 Oct 2019 09:38:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:40290 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728872AbfJUNiw (ORCPT ); Mon, 21 Oct 2019 09:38:52 -0400 Received: from quaco.ghostprotocols.net (unknown [179.97.35.50]) (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 C95B5214AE; Mon, 21 Oct 2019 13:38:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571665131; bh=Zn3tuprfOPLKAmr9XdPjlU6pkfo9Svn84N6ztGvboqE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gx0sW3UJNMUmqySz1ACbgOglza8BLN8FR6aliHvu5+/JfnWYG+3jwAO/On1ee7Myo 4LySLVaZAWmhcZMhtqE5N1TSv5NAbq6ZWsQRLIbAMrQosIKQDvSglUa/wj/+/iOOpk /Gnc6i/egWGJkRI/UryyDfA8Ud2hZ2F3T5siymJk= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Andi Kleen , Arnaldo Carvalho de Melo Subject: [PATCH 03/57] perf evlist: Fix fix for freed id arrays Date: Mon, 21 Oct 2019 10:37:40 -0300 Message-Id: <20191021133834.25998-4-acme@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191021133834.25998-1-acme@kernel.org> References: <20191021133834.25998-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen In the earlier fix for the memory overrun of id arrays I managed to typo the wrong event in the fix. Of course we need to close the current event in the loop, not the original failing event. The same test case as in the original patch still passes. Fixes: 7834fa948beb ("perf evlist: Fix access of freed id arrays") Signed-off-by: Andi Kleen Cc: Jiri Olsa Link: http://lore.kernel.org/lkml/20191011182140.8353-2-andi@firstfloor.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/evlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 21b77efa802c..8793b4e322b0 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -1599,7 +1599,7 @@ struct evsel *perf_evlist__reset_weak_group(struct evlist *evsel_list, is_open = false; if (c2->leader == leader) { if (is_open) - perf_evsel__close(&evsel->core); + perf_evsel__close(&c2->core); c2->leader = c2; c2->core.nr_members = 0; } -- 2.21.0