Skip to content

Commit

Permalink
drivers/perf: arm_pmu_acpi: Fix incorrect checking of gicc pointer
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
luanshi0212 authored and willdeacon committed Mar 2, 2020
1 parent 049d919 commit 3ba52ad
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/perf/arm_pmu_acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ static int arm_pmu_acpi_register_irq(int cpu)
int gsi, trigger;

gicc = acpi_cpu_get_madt_gicc(cpu);
if (WARN_ON(!gicc))
return -EINVAL;

gsi = gicc->performance_interrupt;

Expand Down Expand Up @@ -64,11 +62,10 @@ static void arm_pmu_acpi_unregister_irq(int cpu)
int gsi;

gicc = acpi_cpu_get_madt_gicc(cpu);
if (!gicc)
return;

gsi = gicc->performance_interrupt;
acpi_unregister_gsi(gsi);
if (gsi)
acpi_unregister_gsi(gsi);
}

#if IS_ENABLED(CONFIG_ARM_SPE_PMU)
Expand Down

0 comments on commit 3ba52ad

Please sign in to comment.