2024-06-03 13:46:28

by Tomas Winkler

Subject: [char-misc-next] mei: me: release irq in mei_me_pci_resume error path

The mei_me_pci_resume doesn't release irq on the error path,
in case mei_start() fails.

Signed-off-by: Tomas Winkler <[email protected]>
---
drivers/misc/mei/pci-me.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index 7f59dd38c32f52dccf632fb4..6589635f8ba32b35fd28876d 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -385,8 +385,10 @@ static int mei_me_pci_resume(struct device *device)
}

err = mei_restart(dev);
- if (err)
+ if (err) {
+ free_irq(pdev->irq, dev);
return err;
+ }

/* Start timer if stopped in suspend */
schedule_delayed_work(&dev->timer_work, HZ);
--
2.45.0

2024-06-04 04:46:16

by Greg Kroah-Hartman

Subject: Re: [char-misc-next] mei: me: release irq in mei_me_pci_resume error path

On Mon, Jun 03, 2024 at 04:29:28PM +0300, Tomas Winkler wrote:
> The mei_me_pci_resume doesn't release irq on the error path,
> in case mei_start() fails.
>
> Signed-off-by: Tomas Winkler <[email protected]>
> ---
> drivers/misc/mei/pci-me.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)

What commit does this fix?

thanks,

greg k-h

2024-06-04 05:46:10

by Tomas Winkler

Subject: RE: [char-misc-next] mei: me: release irq in mei_me_pci_resume error path

>
> On Mon, Jun 03, 2024 at 04:29:28PM +0300, Tomas Winkler wrote:
> > The mei_me_pci_resume doesn't release irq on the error path, in case
> > mei_start() fails.
> >
> > Signed-off-by: Tomas Winkler <[email protected]>
> > ---
> > drivers/misc/mei/pci-me.c | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
>
> What commit does this fix?

I would say 33ec0826314734fc4f3c9bf37 , kernel version 3.13, it's very old. I can respin with the comment, if you wish.

Thanks
Tomas

2024-06-04 06:00:14

by Greg Kroah-Hartman

Subject: Re: [char-misc-next] mei: me: release irq in mei_me_pci_resume error path

On Tue, Jun 04, 2024 at 05:45:56AM +0000, Winkler, Tomas wrote:
> >
> > On Mon, Jun 03, 2024 at 04:29:28PM +0300, Tomas Winkler wrote:
> > > The mei_me_pci_resume doesn't release irq on the error path, in case
> > > mei_start() fails.
> > >
> > > Signed-off-by: Tomas Winkler <[email protected]>
> > > ---
> > > drivers/misc/mei/pci-me.c | 4 +++-
> > > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > What commit does this fix?
>
> I would say 33ec0826314734fc4f3c9bf37 , kernel version 3.13, it's very old. I can respin with the comment, if you wish.

As it's a memory-leak fix, that would be good, thanks.

greg k-h