From: Stephane Eranian Date: Fri, 25 Aug 2006 21:00:19 +0000 (-0700) Subject: [IA64] correct file descriptor reference counting in perfmon X-Git-Tag: v2.6.18-rc7~17 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b8444d00762703e1b6146fce12ce2684885f8bf6;p=linux-2.6-omap-h63xx.git [IA64] correct file descriptor reference counting in perfmon Fix a bug in sys_perfmonctl() whereby it was not correctly decrementing the file descriptor reference count. Signed-off-by: stephane eranian Signed-off-by: Tony Luck --- diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index c7ccd6ee1dd..84a7e52f56f 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c @@ -4936,13 +4936,15 @@ abort_locked: if (likely(ctx)) { DPRINT(("context unlocked\n")); UNPROTECT_CTX(ctx, flags); - fput(file); } /* copy argument back to user, if needed */ if (call_made && PFM_CMD_RW_ARG(cmd) && copy_to_user(arg, args_k, base_sz*count)) ret = -EFAULT; error_args: + if (file) + fput(file); + kfree(args_k); DPRINT(("cmd=%s ret=%ld\n", PFM_CMD_NAME(cmd), ret));