| Message ID | 20170829190855.fabfktv2dg57x3gs@mwanda |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] nfp: double free on error in probe | expand |
On Tue, 29 Aug 2017 22:15:16 +0300, Dan Carpenter wrote: > 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>
From: Dan Carpenter <dan.carpenter@oracle.com> Date: Tue, 29 Aug 2017 22:15:16 +0300 > 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> Applied.
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c index d55f6c5ed1be..7c22cc4654b7 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; }
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>