]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
perf/x86/intel/rapl: Fix pmus free during cleanup
authorVincent Stehlé <vincent.stehle@intel.com>
Tue, 24 May 2016 14:53:49 +0000 (16:53 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 27 Jul 2016 15:42:10 +0000 (08:42 -0700)
commit 275ae411e56f8f900fa364da29c4706f9af4e1f3 upstream.

On rapl cleanup path, kfree() is given by mistake the address of the
pointer of the structure to free (rapl_pmus->pmus + i). Pass the pointer
instead (rapl_pmus->pmus[i]).

Fixes: 9de8d686955b "perf/x86/intel/rapl: Convert it to a per package facility"
Signed-off-by: Vincent Stehlé <vincent.stehle@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1464101629-14905-1-git-send-email-vincent.stehle@intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/events/intel/rapl.c

index 1705c9d75e4477e1c246d608fa1e9ebb36f6f50b..78ee9ebe38dd6ef5cf9318394d41828675ad22ea 100644 (file)
@@ -665,7 +665,7 @@ static void __init cleanup_rapl_pmus(void)
        int i;
 
        for (i = 0; i < rapl_pmus->maxpkg; i++)
-               kfree(rapl_pmus->pmus + i);
+               kfree(rapl_pmus->pmus[i]);
        kfree(rapl_pmus);
 }