Prev: [073/140] x86, Calgary: Limit the max PHB number to 256
Next: [067/140] amd64-agp: Probe unknown AGP devices the right way
From: Greg KH on 30 Jul 2010 14:50
2.6.34-stable review patch. If anyone has any objections, please let us know.

------------------

From: Jan Beulich <JBeulich(a)novell.com>

For some reason one of the changes to sys_perf_event_open() got
mis-applied, thus breaking (at least) error handling paths (pointed
out by means of a compiler warning).

Signed-off-by: Jan Beulich <jbeulich(a)novell.com>
Cc: Peter Zijlstra <a.p.zijlstra(a)chello.nl>
Cc: Ingo Molnar <mingo(a)elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
kernel/perf_event.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)

--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -4870,6 +4870,15 @@ SYSCALL_DEFINE5(perf_event_open,
if (event_fd < 0)
return event_fd;

+ /*
+ * Get the target context (task or percpu):
+ */
+ ctx = find_get_context(pid, cpu);
+ if (IS_ERR(ctx)) {
+ err = PTR_ERR(ctx);
+ goto err_fd;
+ }
+
if (group_fd != -1) {
group_leader = perf_fget_light(group_fd, &fput_needed);
if (IS_ERR(group_leader)) {
@@ -4884,15 +4893,6 @@ SYSCALL_DEFINE5(perf_event_open,
}

/*
- * Get the target context (task or percpu):
- */
- ctx = find_get_context(pid, cpu);
- if (IS_ERR(ctx)) {
- err = PTR_ERR(ctx);
- goto err_fd;
- }
-
- /*
* Look up the group leader (we will attach this event to it):
*/
if (group_leader) {


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [073/140] x86, Calgary: Limit the max PHB number to 256
Next: [067/140] amd64-agp: Probe unknown AGP devices the right way