[<prev] [next>] [day] [month] [year] [list]
Message-ID: <tip-0c67b40872326a5340cab51d79a192a5fbaeb484@git.kernel.org>
Date: Mon, 13 Sep 2010 15:19:08 GMT
From: tip-bot for Peter Zijlstra <a.p.zijlstra@...llo.nl>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
a.p.zijlstra@...llo.nl, tglx@...utronix.de, gorcunov@...il.com,
mingo@...e.hu
Subject: [tip:perf/core] perf: Fix free_event()
Commit-ID: 0c67b40872326a5340cab51d79a192a5fbaeb484
Gitweb: http://git.kernel.org/tip/0c67b40872326a5340cab51d79a192a5fbaeb484
Author: Peter Zijlstra <a.p.zijlstra@...llo.nl>
AuthorDate: Mon, 13 Sep 2010 11:15:58 +0200
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Mon, 13 Sep 2010 17:08:42 +0200
perf: Fix free_event()
With the context rework stuff we can actually end up freeing an event
before it gets attached to a context.
Reported-by: Cyrill Gorcunov <gorcunov@...il.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@...llo.nl>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
kernel/perf_event.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index bc46bff..440f9ca 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -2150,7 +2150,9 @@ static void free_event(struct perf_event *event)
if (event->destroy)
event->destroy(event);
- put_ctx(event->ctx);
+ if (event->ctx)
+ put_ctx(event->ctx);
+
call_rcu(&event->rcu_head, free_event_rcu);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists