* [PATCH v2] ACPI / PCI: fix acpi_pci_irq_enable() memory leak
@ 2019-08-21 3:44 Wenwen Wang
2019-09-02 21:19 ` Rafael J. Wysocki
0 siblings, 1 reply; 4+ messages in thread
From: Wenwen Wang @ 2019-08-21 3:44 UTC (permalink / raw)
To: Wenwen Wang
Cc: Bjorn Helgaas, Rafael J. Wysocki, Len Brown,
open list:PCI SUBSYSTEM, open list:ACPI, open list
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>
---
drivers/acpi/pci_irq.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index d2549ae..dea8a60 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)
* No IRQ known to the ACPI subsystem - maybe the BIOS /
* driver reported one, then use it. Exit in any case.
*/
- if (!acpi_pci_irq_valid(dev, pin))
+ if (!acpi_pci_irq_valid(dev, pin)) {
+ kfree(entry);
return 0;
+ }
if (acpi_isa_register_gsi(dev))
dev_warn(&dev->dev, "PCI INT %c: no GSI\n",
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] ACPI / PCI: fix acpi_pci_irq_enable() memory leak
2019-08-21 3:44 [PATCH v2] ACPI / PCI: fix acpi_pci_irq_enable() memory leak Wenwen Wang
@ 2019-09-02 21:19 ` Rafael J. Wysocki
2019-09-02 22:34 ` Bjorn Helgaas
0 siblings, 1 reply; 4+ messages in thread
From: Rafael J. Wysocki @ 2019-09-02 21:19 UTC (permalink / raw)
To: Wenwen Wang, Bjorn Helgaas
Cc: Rafael J. Wysocki, Len Brown, open list:PCI SUBSYSTEM,
open list:ACPI, open list
On Wed, Aug 21, 2019 at 5:44 AM Wenwen Wang <wenwen@cs.uga.edu> wrote:
>
> 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>
Bjorn, any more comments?
> ---
> drivers/acpi/pci_irq.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
> index d2549ae..dea8a60 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)
> * No IRQ known to the ACPI subsystem - maybe the BIOS /
> * driver reported one, then use it. Exit in any case.
> */
> - if (!acpi_pci_irq_valid(dev, pin))
> + if (!acpi_pci_irq_valid(dev, pin)) {
> + kfree(entry);
> return 0;
> + }
>
> if (acpi_isa_register_gsi(dev))
> dev_warn(&dev->dev, "PCI INT %c: no GSI\n",
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] ACPI / PCI: fix acpi_pci_irq_enable() memory leak
2019-09-02 21:19 ` Rafael J. Wysocki
@ 2019-09-02 22:34 ` Bjorn Helgaas
2019-09-03 7:43 ` Rafael J. Wysocki
0 siblings, 1 reply; 4+ messages in thread
From: Bjorn Helgaas @ 2019-09-02 22:34 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Wenwen Wang, Rafael J. Wysocki, Len Brown,
open list:PCI SUBSYSTEM, open list:ACPI, open list
On Mon, Sep 02, 2019 at 11:19:58PM +0200, Rafael J. Wysocki wrote:
> On Wed, Aug 21, 2019 at 5:44 AM Wenwen Wang <wenwen@cs.uga.edu> wrote:
> >
> > 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>
>
> Bjorn, any more comments?
Nope, looks fine to me.
> > ---
> > drivers/acpi/pci_irq.c | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
> > index d2549ae..dea8a60 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)
> > * No IRQ known to the ACPI subsystem - maybe the BIOS /
> > * driver reported one, then use it. Exit in any case.
> > */
> > - if (!acpi_pci_irq_valid(dev, pin))
> > + if (!acpi_pci_irq_valid(dev, pin)) {
> > + kfree(entry);
> > return 0;
> > + }
> >
> > if (acpi_isa_register_gsi(dev))
> > dev_warn(&dev->dev, "PCI INT %c: no GSI\n",
> > --
> > 2.7.4
> >
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] ACPI / PCI: fix acpi_pci_irq_enable() memory leak
2019-09-02 22:34 ` Bjorn Helgaas
@ 2019-09-03 7:43 ` Rafael J. Wysocki
0 siblings, 0 replies; 4+ messages in thread
From: Rafael J. Wysocki @ 2019-09-03 7:43 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: Rafael J. Wysocki, Wenwen Wang, Rafael J. Wysocki, Len Brown,
open list:PCI SUBSYSTEM, open list:ACPI, open list
On Tue, Sep 3, 2019 at 12:34 AM Bjorn Helgaas <helgaas@kernel.org> wrote:
>
> On Mon, Sep 02, 2019 at 11:19:58PM +0200, Rafael J. Wysocki wrote:
> > On Wed, Aug 21, 2019 at 5:44 AM Wenwen Wang <wenwen@cs.uga.edu> wrote:
> > >
> > > 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>
> >
> > Bjorn, any more comments?
>
> Nope, looks fine to me.
Thanks, queuing it up for v5.4 then.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-09-03 7:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-21 3:44 [PATCH v2] ACPI / PCI: fix acpi_pci_irq_enable() memory leak Wenwen Wang
2019-09-02 21:19 ` Rafael J. Wysocki
2019-09-02 22:34 ` Bjorn Helgaas
2019-09-03 7:43 ` Rafael J. Wysocki
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).