perf_counter: Fix output-sharing error path
Commit-ID: dc86cabe4b242446ea9aa8492c727e1220817898 Gitweb: http://git.kernel.org/tip/dc86cabe4b242446ea9aa8492c727e1220817898 Author: Ingo Molnar <[email protected]> AuthorDate: Thu, 3 Sep 2009 18:03:00 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 3 Sep 2009 18:46:23 +0200
perf_counter: Fix output-sharing error path
We forget to release the fd in the PERF_FLAG_FD_OUTPUT error path.
Reorganize the error flow here to be a clean fall-through logic.
Cc: Peter Zijlstra <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Ingo Molnar <[email protected]>
--- kernel/perf_counter.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-)
kernel/perf_counter.c +20 -20
@@ -4316,15 +4316,15 @@ SYSCALL_DEFINE5(perf_counter_open,struct file *group_file =NULL ;int fput_needed =0 ;int fput_needed2 =0 ; -int ret; +int err;/* for future expandability... */ if (flags & ~(PERF_FLAG_FD_NO_GROUP |PERF_FLAG_FD_OUTPUT ))return -EINVAL ; - ret =perf_copy_attr (attr_uptr, &attr); -if (ret) -return ret; + err =perf_copy_attr (attr_uptr, &attr); +if (err) +return err;if (!attr.exclude_kernel) {if (perf_paranoid_kernel () && !capable (CAP_SYS_ADMIN ))
@@ -4348,7 +4348,7 @@ SYSCALL_DEFINE5(perf_counter_open,*/ group_leader =NULL ;if (group_fd !=-1 && !(flags &PERF_FLAG_FD_NO_GROUP )) { - ret = -EINVAL ; + err = -EINVAL ; group_file =fget_light (group_fd, &fput_needed);if (!group_file) goto err_put_context;
@@ -4377,22 +4377,22 @@ SYSCALL_DEFINE5(perf_counter_open, counter =perf_counter_alloc (&attr, cpu, ctx, group_leader,NULL ,GFP_KERNEL ); - ret =PTR_ERR (counter); + err =PTR_ERR (counter);if (IS_ERR (counter)) goto err_put_context; - ret =anon_inode_getfd ("[perf_counter]" , &perf_fops, counter,0 ); -if (ret <0 ) + err =anon_inode_getfd ("[perf_counter]" , &perf_fops, counter,0 ); +if (err <0 ) goto err_free_put_context; - counter_file =fget_light (ret, &fput_needed2); + counter_file =fget_light (err, &fput_needed2);if (!counter_file) goto err_free_put_context;if (flags &PERF_FLAG_FD_OUTPUT ) { - ret =perf_counter_set_output (counter, group_fd); -if (ret) - goto err_free_put_context; + err =perf_counter_set_output (counter, group_fd); +if (err) + goto err_fput_free_put_context; } counter->filp = counter_file;
@@ -4408,20 +4408,20 @@ SYSCALL_DEFINE5(perf_counter_open,list_add_tail (&counter->owner_entry, ¤t->perf_counter_list);mutex_unlock (¤t->perf_counter_mutex); +err_fput_free_put_context:fput_light (counter_file, fput_needed2); -out_fput: -fput_light (group_file, fput_needed); - -return ret; - err_free_put_context: -kfree (counter); +if (err <0 ) +kfree (counter); err_put_context: -put_ctx (ctx); +if (err <0 ) +put_ctx (ctx); + +fput_light (group_file, fput_needed); - goto out_fput; +return err; }/*