Commit f5fa05d9 authored May 04, 2010 by Linus Torvalds

Merge branch 'perf-fixes-for-linus' of...

Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf: Fix resource leak in failure path of perf_event_open()

parents f2809d61 048c8520

kernel/perf_event.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4897,7 +4897,7 @@ err_fput_free_put_context:

		err_free_put_context:
		if (err < 0)
		kfree(event);
		free_event(event);

		err_put_context:
		if (err < 0)