diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2017-08-29 22:15:16 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-08-29 16:07:23 -0700 |
| commit | e7562597b46d099a78d45c781ee8d1a7a93c53f1 (patch) | |
| tree | a214f38a0e75cf1cb38f50c6c71d07195f0fea80 /drivers/net/ethernet/netronome/nfp/nfp_net_main.c | |
| parent | Merge branch 'aquantia-fixes' (diff) | |
| download | linux-dev-e7562597b46d099a78d45c781ee8d1a7a93c53f1.tar.xz linux-dev-e7562597b46d099a78d45c781ee8d1a7a93c53f1.zip | |
nfp: double free on error in probe
Both the nfp_net_pf_app_start() and the nfp_net_pci_probe() functions
call nfp_net_pf_app_stop_ctrl(pf) so there is a double free. The free
should be done from the probe function because it's allocated there so
I have removed the call from nfp_net_pf_app_start().
Fixes: 02082701b974 ("nfp: create control vNICs and wire up rx/tx")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/netronome/nfp/nfp_net_main.c')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c index 1aca4e57bf41..34b985384d26 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c @@ -458,7 +458,7 @@ static int nfp_net_pf_app_start(struct nfp_pf *pf) err = nfp_app_start(pf->app, pf->ctrl_vnic); if (err) - goto err_ctrl_stop; + return err; if (pf->num_vfs) { err = nfp_app_sriov_enable(pf->app, pf->num_vfs); @@ -470,8 +470,6 @@ static int nfp_net_pf_app_start(struct nfp_pf *pf) err_app_stop: nfp_app_stop(pf->app); -err_ctrl_stop: - nfp_net_pf_app_stop_ctrl(pf); return err; } |