linux-kernel - [PATCH 1/1] perf/amd: NULL return of kzalloc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 10 Jun 2014 15:37:38 +0800
From:	Zhouyi Zhou <zhouzhouyi@...il.com>
To:	<a.p.zijlstra@...llo.nl>, <paulus@...ba.org>, <mingo@...hat.com>,
	<acme@...nel.org>, <tglx@...utronix.de>, <hpa@...or.com>,
	<x86@...nel.org>, <linux-kernel@...r.kernel.org>
Cc:	Zhouyi Zhou <zhouzhouyi@...il.com>,
	Zhouyi Zhou <yizhouzhou@....ac.cn>
Subject: [PATCH 1/1] perf/amd: NULL return of kzalloc_node should be handled


Signed-off-by: Zhouyi Zhou <yizhouzhou@....ac.cn>
---
 arch/x86/kernel/cpu/perf_event_amd_uncore.c |   32 +++++++++++++++------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/arch/x86/kernel/cpu/perf_event_amd_uncore.c b/arch/x86/kernel/cpu/perf_event_amd_uncore.c
index 3bbdf4c..f60a50e 100644
--- a/arch/x86/kernel/cpu/perf_event_amd_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_amd_uncore.c
@@ -300,24 +300,28 @@ static void amd_uncore_cpu_up_prepare(unsigned int cpu)
 
 	if (amd_uncore_nb) {
 		uncore = amd_uncore_alloc(cpu);
-		uncore->cpu = cpu;
-		uncore->num_counters = NUM_COUNTERS_NB;
-		uncore->rdpmc_base = RDPMC_BASE_NB;
-		uncore->msr_base = MSR_F15H_NB_PERF_CTL;
-		uncore->active_mask = &amd_nb_active_mask;
-		uncore->pmu = &amd_nb_pmu;
-		*per_cpu_ptr(amd_uncore_nb, cpu) = uncore;
+		if (uncore) {
+			uncore->cpu = cpu;
+			uncore->num_counters = NUM_COUNTERS_NB;
+			uncore->rdpmc_base = RDPMC_BASE_NB;
+			uncore->msr_base = MSR_F15H_NB_PERF_CTL;
+			uncore->active_mask = &amd_nb_active_mask;
+			uncore->pmu = &amd_nb_pmu;
+			*per_cpu_ptr(amd_uncore_nb, cpu) = uncore;
+		}
 	}
 
 	if (amd_uncore_l2) {
 		uncore = amd_uncore_alloc(cpu);
-		uncore->cpu = cpu;
-		uncore->num_counters = NUM_COUNTERS_L2;
-		uncore->rdpmc_base = RDPMC_BASE_L2;
-		uncore->msr_base = MSR_F16H_L2I_PERF_CTL;
-		uncore->active_mask = &amd_l2_active_mask;
-		uncore->pmu = &amd_l2_pmu;
-		*per_cpu_ptr(amd_uncore_l2, cpu) = uncore;
+		if (uncore) {
+			uncore->cpu = cpu;
+			uncore->num_counters = NUM_COUNTERS_L2;
+			uncore->rdpmc_base = RDPMC_BASE_L2;
+			uncore->msr_base = MSR_F16H_L2I_PERF_CTL;
+			uncore->active_mask = &amd_l2_active_mask;
+			uncore->pmu = &amd_l2_pmu;
+			*per_cpu_ptr(amd_uncore_l2, cpu) = uncore;
+		}
 	}
 }
 
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/