From: tip-bot for Thomas Gleixner <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org, jolsa@redhat.com,
tglx@linutronix.de, torvalds@linux-foundation.org,
peterz@infradead.org, vincent.weaver@maine.edu, hpa@zytor.com,
mingo@kernel.org, eranian@google.com
Subject: [tip:perf/core] perf/core: Plug potential memory leak in CPU_UP_PREPARE
Date: Wed, 17 Feb 2016 04:24:55 -0800 [thread overview]
Message-ID: <tip-059fcd8cd16622da6513804a7a3e826d152c6c96@git.kernel.org> (raw)
In-Reply-To: <20160209201007.843269966@linutronix.de>
Commit-ID: 059fcd8cd16622da6513804a7a3e826d152c6c96
Gitweb: http://git.kernel.org/tip/059fcd8cd16622da6513804a7a3e826d152c6c96
Author: Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Tue, 9 Feb 2016 20:11:34 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 17 Feb 2016 10:37:30 +0100
perf/core: Plug potential memory leak in CPU_UP_PREPARE
If CPU_UP_PREPARE is called it is not guaranteed, that a previously allocated
and assigned hash has been freed already, but perf_event_init_cpu()
unconditionally allocates and assignes a new hash if the swhash is referenced.
By overwriting the pointer the existing hash is not longer accessible.
Verify that there is no hash assigned on this cpu before allocating and
assigning a new one.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: http://lkml.kernel.org/r/20160209201007.843269966@linutronix.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
kernel/events/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 4aa64a8..0d58522 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -9206,7 +9206,7 @@ static void perf_event_init_cpu(int cpu)
struct swevent_htable *swhash = &per_cpu(swevent_htable, cpu);
mutex_lock(&swhash->hlist_mutex);
- if (swhash->hlist_refcount > 0) {
+ if (swhash->hlist_refcount > 0 && !swevent_hlist_deref(swhash)) {
struct swevent_hlist *hlist;
hlist = kzalloc_node(sizeof(*hlist), GFP_KERNEL, cpu_to_node(cpu));
next prev parent reply other threads:[~2016-02-17 12:28 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-09 20:11 [patch 0/4] perf: Fix various cpu hotplug oddities Thomas Gleixner
2016-02-09 20:11 ` [patch 1/4] perf: Remove bogus UP_CANCELED hotplug state Thomas Gleixner
2016-02-17 12:24 ` [tip:perf/core] perf/core: " tip-bot for Thomas Gleixner
2016-02-09 20:11 ` [patch 2/4] perf: Remove the bogus and dangerous CPU_DOWN_FAILED " Thomas Gleixner
2016-02-17 12:24 ` [tip:perf/core] perf/core: " tip-bot for Thomas Gleixner
2016-02-09 20:11 ` [patch 3/4] perf: Plug potential memory leak in CPU_UP_PREPARE Thomas Gleixner
2016-02-17 12:24 ` tip-bot for Thomas Gleixner [this message]
2016-02-09 20:11 ` [patch 4/4] perf: Remove unused arguments from a bunch of functions Thomas Gleixner
2016-02-17 12:25 ` [tip:perf/core] perf/core: " tip-bot for Thomas Gleixner
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=tip-059fcd8cd16622da6513804a7a3e826d152c6c96@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=eranian@google.com \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=vincent.weaver@maine.edu \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.