---

yaml --- r: 211939 b: refs/heads/master c: e7d0bc0 h: refs/heads/master i: 211937: 6a25437 211935: 138f41d v: v3
git-mirror · Oct 18, 2010 · ad673e8 · ad673e8
1 parent 7a37b12
commit ad673e8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74c3337c2fc6389d3a57a622a936036b6db6b2e8
+refs/heads/master: e7d0bc047548d76feee6b23f7d3d9da927189a50
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
@@ -2190,11 +2190,9 @@ find_get_context(struct pmu *pmu, struct task_struct *task, int cpu)
 		}
 	}
 
-	put_task_struct(task);
 	return ctx;
 
 errout:
-	put_task_struct(task);
 	return ERR_PTR(err);
 }
 
@@ -5602,7 +5600,7 @@ SYSCALL_DEFINE5(perf_event_open,
 	ctx = find_get_context(pmu, task, cpu);
 	if (IS_ERR(ctx)) {
 		err = PTR_ERR(ctx);
-		goto err_group_fd;
+		goto err_task;
 	}
 
 	/*
@@ -5698,6 +5696,9 @@ SYSCALL_DEFINE5(perf_event_open,
 
 err_context:
 	put_ctx(ctx);
+err_task:
+	if (task)
+		put_task_struct(task);
 err_group_fd:
 	fput_light(group_file, fput_needed);
 	free_event(event);