TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drivers/perf: arm_pmu_acpi: Fix incorrect checking of gicc pointer

Browse Source 
[ Upstream commit 3ba52ad55b533760a1f65836aa0ec9d35e36bb4f ]

Fix bogus NULL checks on the return value of acpi_cpu_get_madt_gicc()
by checking for a 0 'gicc->performance_interrupt' value instead.

Signed-off-by: Liguang Zhang <zhangliguang@linux.alibaba.com>
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
luanshi
2020-02-26 13:45:10 +08:00
committed by Greg Kroah-Hartman
parent a832f5e0e8
commit b3e9f82b2a
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/perf/arm_pmu_acpi.c
View File

@@ -27,8 +27,6 @@ static int arm_pmu_acpi_register_irq(int cpu)
int gsi, trigger; int gsi, trigger;
gicc = acpi_cpu_get_madt_gicc(cpu); gicc = acpi_cpu_get_madt_gicc(cpu);
if (WARN_ON(!gicc))
return -EINVAL;
gsi = gicc->performance_interrupt; gsi = gicc->performance_interrupt;
@@ -67,11 +65,10 @@ static void arm_pmu_acpi_unregister_irq(int cpu)
int gsi; int gsi;
gicc = acpi_cpu_get_madt_gicc(cpu); gicc = acpi_cpu_get_madt_gicc(cpu);
if (!gicc)
return;
gsi = gicc->performance_interrupt; gsi = gicc->performance_interrupt;
acpi_unregister_gsi(gsi); if (gsi)
acpi_unregister_gsi(gsi);
} }
static int arm_pmu_acpi_parse_irqs(void) static int arm_pmu_acpi_parse_irqs(void)