Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 26 Apr 2021 18:54:10 +0200
From:   Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To:     Thomas Gleixner <tglx@linutronix.de>
Cc:     Bjorn Helgaas <helgaas@kernel.org>, linux-kernel@vger.kernel.org,
        Wenwen Wang <wang6495@umn.edu>,
        Bjorn Helgaas <bhelgaas@google.com>,
        Ingo Molnar <mingo@kernel.org>
Subject: Re: [PATCH 086/190] Revert "x86/PCI: Fix PCI IRQ routing table
 memory leak"
Message-ID: <YIbwMhw2sGRpNenN@kroah.com>
References: <20210422050919.GA2913711@bjorn-Precision-5520>
 <87a6ppwcmc.ffs@nanos.tec.linutronix.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <87a6ppwcmc.ffs@nanos.tec.linutronix.de>
Precedence: bulk

On Fri, Apr 23, 2021 at 11:53:31AM +0200, Thomas Gleixner wrote:
> On Thu, Apr 22 2021 at 00:09, Bjorn Helgaas wrote:
> > On Wed, Apr 21, 2021 at 02:59:21PM +0200, Greg Kroah-Hartman wrote:
> > I would prefer that you not apply this revert.
> >
> > Prior to ea094d53580f ("x86/PCI: Fix PCI IRQ routing table memory
> > leak"), we had essentially this:
> >
> >   pcibios_irq_init()
> >     pirq_table = pcibios_get_irq_routing_table();  # kmallocs
> >     if (pirq_table) {
> >       if (io_apic_assign_pci_irqs)
> > 	pirq_table = NULL;
> >     }
> >
> > So if we called pcibios_get_irq_routing_table(), we kmalloced some
> > space and then (if io_apic_assign_pci_irqs) threw away the pointer,
> > which leaks the pointer as the commit log says.
> >
> > After ea094d53580f, we have:
> >
> >   pcibios_irq_init()
> >     rtable = NULL;
> >     pirq_table = pcibios_get_irq_routing_table();  # kmallocs
> >     rtable = pirq_table;
> >     if (pirq_table) {
> >       if (io_apic_assign_pci_irqs) {
> >         kfree(rtable);
> > 	pirq_table = NULL;
> >       }
> >     }
> >
> > which seems right to me.
> 
> It is correct.

Thanks for the review, I'll go drop this revert.

greg k-h