linux-perf-users.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>, Thomas Gleixner <tglx@linutronix.de>
Cc: Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
	Clark Williams <williams@redhat.com>,
	linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
	Andi Kleen <ak@linux.intel.com>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 02/11] perf evlist: Fix fix for freed id arrays
Date: Thu, 17 Oct 2019 13:02:52 -0300	[thread overview]
Message-ID: <20191017160301.20888-3-acme@kernel.org> (raw)
In-Reply-To: <20191017160301.20888-1-acme@kernel.org>

From: Andi Kleen <ak@linux.intel.com>

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 <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Link: http://lore.kernel.org/lkml/20191011182140.8353-2-andi@firstfloor.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 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 d277a98e62df..de79c735e441 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -1659,7 +1659,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

  parent reply	other threads:[~2019-10-17 16:02 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-17 16:02 [GIT PULL] perf/urgent fixes Arnaldo Carvalho de Melo
2019-10-17 16:02 ` [PATCH 01/11] perf jvmti: Link against tools/lib/ctype.h to have weak strlcpy() Arnaldo Carvalho de Melo
2019-10-17 16:02 ` Arnaldo Carvalho de Melo [this message]
2019-10-17 16:02 ` [PATCH 03/11] perf tools: Fix resource leak of closedir() on the error paths Arnaldo Carvalho de Melo
2019-10-17 16:02 ` [PATCH 04/11] perf annotate: Fix multiple memory and file descriptor leaks Arnaldo Carvalho de Melo
2019-10-17 16:02 ` [PATCH 05/11] perf tools: Fix mode setting in copyfile_mode_ns() Arnaldo Carvalho de Melo
2019-10-17 16:02 ` [PATCH 06/11] perf c2c: Fix memory leak in build_cl_output() Arnaldo Carvalho de Melo
2019-10-17 16:02 ` [PATCH 07/11] tools headers kvm: Sync kvm headers with the kernel sources Arnaldo Carvalho de Melo
2019-10-17 16:02 ` [PATCH 08/11] " Arnaldo Carvalho de Melo
2019-10-17 16:02 ` [PATCH 09/11] tools headers kvm: Sync kvm.h " Arnaldo Carvalho de Melo
2019-10-17 16:03 ` [PATCH 10/11] tools headers UAPI: Sync sched.h with the kernel Arnaldo Carvalho de Melo
2019-10-17 16:03 ` [PATCH 11/11] perf kmem: Fix memory leak in compact_gfp_flags() Arnaldo Carvalho de Melo
2019-10-21  6:23 ` [GIT PULL] perf/urgent fixes Ingo Molnar
2019-10-21 12:20   ` Arnaldo Carvalho de Melo
2019-11-06 19:10   ` Arnaldo Carvalho de Melo
2019-11-07  7:02     ` Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191017160301.20888-3-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=ak@linux.intel.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=williams@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).