2020-11-12 15:03:24

by Yue Haibing

Subject: [PATCH] nfp: Fix passing zero to 'PTR_ERR'

nfp_cpp_from_nfp6000_pcie() returns ERR_PTR() and never returns
NULL. The NULL test should be removed, also return correct err.

Fixes: 63461a028f76 ("nfp: add the PF driver")
Signed-off-by: YueHaibing <[email protected]>
---
drivers/net/ethernet/netronome/nfp/nfp_main.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_main.c b/drivers/net/ethernet/netronome/nfp/nfp_main.c
index 7ff2ccbd43b0..e672614d2906 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_main.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_main.c
@@ -724,10 +724,8 @@ static int nfp_pci_probe(struct pci_dev *pdev,
}

pf->cpp = nfp_cpp_from_nfp6000_pcie(pdev);
- if (IS_ERR_OR_NULL(pf->cpp)) {
+ if (IS_ERR(pf->cpp)) {
err = PTR_ERR(pf->cpp);
- if (err >= 0)
- err = -ENOMEM;
goto err_disable_msix;
}

--
2.17.1

2020-11-12 15:30:43

by Simon Horman

Subject: Re: [PATCH] nfp: Fix passing zero to 'PTR_ERR'

On Thu, Nov 12, 2020 at 10:58:52PM +0800, YueHaibing wrote:
> nfp_cpp_from_nfp6000_pcie() returns ERR_PTR() and never returns
> NULL. The NULL test should be removed, also return correct err.
>
> Fixes: 63461a028f76 ("nfp: add the PF driver")
> Signed-off-by: YueHaibing <[email protected]>

Thanks, this does indeed seem to be the case.

Reviewed-by: Simon Horman <[email protected]>

2020-11-12 18:13:52

by Jakub Kicinski

Subject: Re: [PATCH] nfp: Fix passing zero to 'PTR_ERR'

On Thu, 12 Nov 2020 16:26:03 +0100 Simon Horman wrote:
> On Thu, Nov 12, 2020 at 10:58:52PM +0800, YueHaibing wrote:
> > nfp_cpp_from_nfp6000_pcie() returns ERR_PTR() and never returns
> > NULL. The NULL test should be removed, also return correct err.
> >
> > Fixes: 63461a028f76 ("nfp: add the PF driver")
> > Signed-off-by: YueHaibing <[email protected]>
>
> Thanks, this does indeed seem to be the case.
>
> Reviewed-by: Simon Horman <[email protected]>

Thanks!

I'll drop the fixes tag and apply to net-next, though.
Unnecessary NULL-check is hardly a bug.