Skip to content

Commit

Permalink
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/l…
Browse files Browse the repository at this point in the history
…inux/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()
  • Loading branch information
torvalds committed May 4, 2010
2 parents f2809d6 + 048c852 commit f5fa05d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion kernel/perf_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -4897,7 +4897,7 @@ SYSCALL_DEFINE5(perf_event_open,

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

err_put_context:
if (err < 0)
Expand Down

0 comments on commit f5fa05d

Please sign in to comment.