History

x86/PCI: Fix PCI IRQ routing table memory leak

In pcibios_irq_init(), the PCI IRQ routing table 'pirq_table' is first found through pirq_find_routing_table(). If the table is not found and CONFIG_PCI_BIOS is defined, the table is then allocated in pcibios_get_irq_routing_table() using kmalloc(). Later, if the I/O APIC is used, this table is actually not used. In that case, the allocated table is not freed, which is a memory leak. Free the allocated table if it is not used.

Wenwen Wang committed 7 years ago

Commit ea094d51 parent 804ee5b1 file · +8 −2Browse files

Unified · Split

arch/x86/pci/irq.c+8−2
@@ -1119,6 +1119,8 @@ static const struct dmi_system_id pciirq_dmi_table[] __initconst = { · 1118 unmodified lines
11191119
11201120 void __init pcibios_irq_init(void)
11211121 {
1122+ struct irq_routing_table *rtable = NULL;
1123+
11221124 DBG(KERN_DEBUG "PCI: IRQ init\n");
11231125
11241126 if (raw_pci_ops == NULL)
@@ -1129,8 +1131,10 @@ void __init pcibios_irq_init(void) · 4 unmodified lines
11291131 pirq_table = pirq_find_routing_table();
11301132
11311133 #ifdef CONFIG_PCI_BIOS
1132− if (!pirq_table && (pci_probe & PCI_BIOS_IRQ_SCAN))
1134+ if (!pirq_table && (pci_probe & PCI_BIOS_IRQ_SCAN)) {
11331135 pirq_table = pcibios_get_irq_routing_table();
1136+ rtable = pirq_table;
1137+ }
11341138 #endif
11351139 if (pirq_table) {
11361140 pirq_peer_trick();
@@ -1145,8 +1149,10 @@ void __init pcibios_irq_init(void) · 8 unmodified lines
11451149 * If we're using the I/O APIC, avoid using the PCI IRQ
11461150 * routing table
11471151 */
1148− if (io_apic_assign_pci_irqs)
1152+ if (io_apic_assign_pci_irqs) {
1153+ kfree(rtable);
11491154 pirq_table = NULL;
1155+ }
11501156 }
11511157
11521158 x86_init.pci.fixup_irqs();

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t