aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWenwen Wang <wenwen@cs.uga.edu>2019-08-20 23:44:19 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-09-03 03:41:25 -0400
commit29b49958cf73b439b17fa29e9a25210809a6c01c (patch)
treee97415da3b81b4d0da46845cb2de41948d0612fa
parent8698fab1c69a7265282d6b2ac081122e94d72cf8 (diff)
ACPI / PCI: fix acpi_pci_irq_enable() memory leak
In acpi_pci_irq_enable(), 'entry' is allocated by kzalloc() in acpi_pci_irq_check_entry() (invoked from acpi_pci_irq_lookup()). However, it is not deallocated if acpi_pci_irq_valid() returns false, leading to a memory leak. To fix this issue, free 'entry' before returning 0. Fixes: e237a5518425 ("x86/ACPI/PCI: Recognize that Interrupt Line 255 means "not connected"") Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/pci_irq.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index d2549ae65e1b..dea8a60e18a4 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -449,8 +449,10 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
449 * No IRQ known to the ACPI subsystem - maybe the BIOS / 449 * No IRQ known to the ACPI subsystem - maybe the BIOS /
450 * driver reported one, then use it. Exit in any case. 450 * driver reported one, then use it. Exit in any case.
451 */ 451 */
452 if (!acpi_pci_irq_valid(dev, pin)) 452 if (!acpi_pci_irq_valid(dev, pin)) {
453 kfree(entry);
453 return 0; 454 return 0;
455 }
454 456
455 if (acpi_isa_register_gsi(dev)) 457 if (acpi_isa_register_gsi(dev))
456 dev_warn(&dev->dev, "PCI INT %c: no GSI\n", 458 dev_warn(&dev->dev, "PCI INT %c: no GSI\n",