2020-08-23 08:04:17

by Dinghao Liu

Subject: [PATCH] ntb: intel: Fix memleak in intel_ntb_pci_probe

The default error branch of a series of pdev_is_gen calls
should free ndev just like what we've done in these calls.

Signed-off-by: Dinghao Liu <[email protected]>
---
drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/ntb/hw/intel/ntb_hw_gen1.c b/drivers/ntb/hw/intel/ntb_hw_gen1.c
index 3185efeab487..093dd20057b9 100644
--- a/drivers/ntb/hw/intel/ntb_hw_gen1.c
+++ b/drivers/ntb/hw/intel/ntb_hw_gen1.c
@@ -1893,7 +1893,7 @@ static int intel_ntb_pci_probe(struct pci_dev *pdev,
goto err_init_dev;
} else {
rc = -EINVAL;
- goto err_ndev;
+ goto err_init_pci;
}

ndev_reset_unsafe_flags(ndev);
--
2.17.1

2020-08-24 14:41:13

by Dave Jiang

Subject: Re: [PATCH] ntb: intel: Fix memleak in intel_ntb_pci_probe

On 8/22/2020 11:55 PM, Dinghao Liu wrote:
> The default error branch of a series of pdev_is_gen calls
> should free ndev just like what we've done in these calls.
>
> Signed-off-by: Dinghao Liu <[email protected]>

Thanks Dinghao
Acked-by: Dave Jiang <[email protected]>

> ---
> drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/ntb/hw/intel/ntb_hw_gen1.c b/drivers/ntb/hw/intel/ntb_hw_gen1.c
> index 3185efeab487..093dd20057b9 100644
> --- a/drivers/ntb/hw/intel/ntb_hw_gen1.c
> +++ b/drivers/ntb/hw/intel/ntb_hw_gen1.c
> @@ -1893,7 +1893,7 @@ static int intel_ntb_pci_probe(struct pci_dev *pdev,
> goto err_init_dev;
> } else {
> rc = -EINVAL;
> - goto err_ndev;
> + goto err_init_pci;
> }
>
> ndev_reset_unsafe_flags(ndev);
>

2020-08-24 14:50:13

by Jon Mason

Subject: Re: [PATCH] ntb: intel: Fix memleak in intel_ntb_pci_probe

On Mon, Aug 24, 2020 at 07:37:56AM -0700, Dave Jiang wrote:
>
>
> On 8/22/2020 11:55 PM, Dinghao Liu wrote:
> > The default error branch of a series of pdev_is_gen calls
> > should free ndev just like what we've done in these calls.
> >
> > Signed-off-by: Dinghao Liu <[email protected]>
>
> Thanks Dinghao
> Acked-by: Dave Jiang <[email protected]>

Added to my ntb branch.
I added
Fixes: 26bfe3d0b227 ("ntb: intel: Add Icelake (gen4) support for Intel NTB")

Thanks,
Jon


>
> > ---
> > drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/ntb/hw/intel/ntb_hw_gen1.c b/drivers/ntb/hw/intel/ntb_hw_gen1.c
> > index 3185efeab487..093dd20057b9 100644
> > --- a/drivers/ntb/hw/intel/ntb_hw_gen1.c
> > +++ b/drivers/ntb/hw/intel/ntb_hw_gen1.c
> > @@ -1893,7 +1893,7 @@ static int intel_ntb_pci_probe(struct pci_dev *pdev,
> > goto err_init_dev;
> > } else {
> > rc = -EINVAL;
> > - goto err_ndev;
> > + goto err_init_pci;
> > }
> > ndev_reset_unsafe_flags(ndev);
> >