From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755694AbcEXOyI (ORCPT ); Tue, 24 May 2016 10:54:08 -0400 Received: from mga11.intel.com ([192.55.52.93]:64129 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752990AbcEXOyF (ORCPT ); Tue, 24 May 2016 10:54:05 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,360,1459839600"; d="scan'208";a="983714447" From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, =?UTF-8?q?Vincent=20Stehl=C3=A9?= , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" Subject: [PATCH] perf/x86/intel/rapl: fix pmus free during cleanup Date: Tue, 24 May 2016 16:53:49 +0200 Message-Id: <1464101629-14905-1-git-send-email-vincent.stehle@intel.com> X-Mailer: git-send-email 2.8.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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]). This was introduced by commit 9de8d686955b0e8e27847ed4edbbcd280f3fd8 ("perf/x86/intel/rapl: Convert it to a per package facility"). Signed-off-by: Vincent Stehlé Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" --- arch/x86/events/intel/rapl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c index 99c4bab..e30eef4 100644 --- a/arch/x86/events/intel/rapl.c +++ b/arch/x86/events/intel/rapl.c @@ -714,7 +714,7 @@ static void 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); } -- 2.8.1