From: Bjorn Helgaas <helgaas@kernel.org>
To: Wenwen Wang <wang6495@umn.edu>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>,
"maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)"
<x86@kernel.org>,
"open list:PCI SUBSYSTEM" <linux-pci@vger.kernel.org>,
"open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)"
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v4] x86/PCI: fix a memory leak bug
Date: Wed, 17 Apr 2019 15:35:14 -0500 [thread overview]
Message-ID: <20190417203514.GT126710@google.com> (raw)
In-Reply-To: <1555510730-9060-1-git-send-email-wang6495@umn.edu>
On Wed, Apr 17, 2019 at 09:18:50AM -0500, Wenwen Wang wrote:
> In pcibios_irq_init(), the PCI IRQ routing table 'pirq_table' is firstly
> 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(). In the following
> execution, if the I/O APIC is used, this table is actually not used.
> However, in that case, the allocated table is not freed, which is a memory
> leak bug.
>
> To fix this issue, free the allocated table if it is not used.
>
> Signed-off-by: Wenwen Wang <wang6495@umn.edu>
> Acked-by: Thomas Gleixner <tglx@linutronix.de>
I added Ingo's reviewed-by (since the only change from v1 was to make the
local variable name change he suggested) and applied this to pci/misc for
v5.2, thanks!
> ---
> arch/x86/pci/irq.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
> index 52e5510..d3a73f9 100644
> --- a/arch/x86/pci/irq.c
> +++ b/arch/x86/pci/irq.c
> @@ -1119,6 +1119,8 @@ static const struct dmi_system_id pciirq_dmi_table[] __initconst = {
>
> void __init pcibios_irq_init(void)
> {
> + struct irq_routing_table *rtable = NULL;
> +
> DBG(KERN_DEBUG "PCI: IRQ init\n");
>
> if (raw_pci_ops == NULL)
> @@ -1129,8 +1131,10 @@ void __init pcibios_irq_init(void)
> pirq_table = pirq_find_routing_table();
>
> #ifdef CONFIG_PCI_BIOS
> - if (!pirq_table && (pci_probe & PCI_BIOS_IRQ_SCAN))
> + if (!pirq_table && (pci_probe & PCI_BIOS_IRQ_SCAN)) {
> pirq_table = pcibios_get_irq_routing_table();
> + rtable = pirq_table;
> + }
> #endif
> if (pirq_table) {
> pirq_peer_trick();
> @@ -1145,8 +1149,10 @@ void __init pcibios_irq_init(void)
> * If we're using the I/O APIC, avoid using the PCI IRQ
> * routing table
> */
> - if (io_apic_assign_pci_irqs)
> + if (io_apic_assign_pci_irqs) {
> + kfree(rtable);
> pirq_table = NULL;
> + }
> }
>
> x86_init.pci.fixup_irqs();
> --
> 2.7.4
>
prev parent reply other threads:[~2019-04-17 20:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-17 14:18 [PATCH v4] x86/PCI: fix a memory leak bug Wenwen Wang
2019-04-17 20:35 ` Bjorn Helgaas [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190417203514.GT126710@google.com \
--to=helgaas@kernel.org \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=wang6495@umn.edu \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).