Commit e7562597 authored Aug 29, 2017 by Dan Carpenter Committed by David S. Miller Aug 29, 2017

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: 02082701 ("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>

parent beae0413

drivers/net/ethernet/netronome/nfp/nfp_net_main.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message