Skip to contentSkip to conversation

Patch "perf/x86/intel/rapl: Fix pmus free during cleanup" has been added to the 4.6-stable tree

PATCH [email protected] 1 participant 1 message Jul 11, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

perf/x86/intel/rapl: Fix pmus free during cleanup

to the 4.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
perf-x86-intel-rapl-fix-pmus-free-during-cleanup.patch
and it can be found in the queue-4.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 275ae411e56f8f900fa364da29c4706f9af4e1f3 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= <[email protected]>
Date: Tue, 24 May 2016 16:53:49 +0200
Subject: perf/x86/intel/rapl: Fix pmus free during cleanup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Vincent Stehlé <[email protected]>

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"
Cc Peter Zijlstra <[email protected]>
---
 arch/x86/events/intel/rapl.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/rapl.c +1 -1
@@ -665,7 +665,7 @@ static void __init cleanup_rapl_pmus(voi
 	int i;
 
 	for (i = 0; i < rapl_pmus->maxpkg; i++)
-		kfree(rapl_pmus->pmus + i);
+		kfree(rapl_pmus->pmus[i]);
 	kfree(rapl_pmus);
 }
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.6/perf-x86-intel-rapl-fix-pmus-free-during-cleanup.patch