[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date: Thu, 9 Sep 2010 19:45:07 GMT
From: tip-bot for Li Zefan <lizf@...fujitsu.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
a.p.zijlstra@...llo.nl, lizf@...fujitsu.com, tglx@...utronix.de,
avi@...hat.com, mingo@...e.hu
Subject: [tip:perf/core] perf, trace: Fix module leak
Commit-ID: 9cb627d5f38830ca19aa0dca52d1d3a633018bf7
Gitweb: http://git.kernel.org/tip/9cb627d5f38830ca19aa0dca52d1d3a633018bf7
Author: Li Zefan <lizf@...fujitsu.com>
AuthorDate: Wed, 1 Sep 2010 12:58:43 +0200
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Thu, 9 Sep 2010 20:38:51 +0200
perf, trace: Fix module leak
Commit 1c024eca (perf, trace: Optimize tracepoints by using
per-tracepoint-per-cpu hlist to track events) caused a module
refcount leak.
Reported-And-Tested-by: Avi Kivity <avi@...hat.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@...llo.nl>
LKML-Reference: <4C7E1F12.8030304@...fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
kernel/trace/trace_event_perf.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c
index 000e6e8..31cc4cb 100644
--- a/kernel/trace/trace_event_perf.c
+++ b/kernel/trace/trace_event_perf.c
@@ -91,6 +91,8 @@ int perf_trace_init(struct perf_event *p_event)
tp_event->class && tp_event->class->reg &&
try_module_get(tp_event->mod)) {
ret = perf_trace_event_init(tp_event, p_event);
+ if (ret)
+ module_put(tp_event->mod);
break;
}
}
@@ -146,6 +148,7 @@ void perf_trace_destroy(struct perf_event *p_event)
}
}
out:
+ module_put(tp_event->mod);
mutex_unlock(&event_mutex);
}
--
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