* [PATCH net] nfp: double free on error in probe
@ 2017-08-29 19:15 Dan Carpenter
2017-08-29 20:05 ` Jakub Kicinski
2017-08-29 23:07 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2017-08-29 19:15 UTC (permalink / raw)
To: Jakub Kicinski
Cc: David S. Miller, Simon Horman, oss-drivers, netdev,
kernel-janitors
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>
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;
}
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net] nfp: double free on error in probe
2017-08-29 19:15 [PATCH net] nfp: double free on error in probe Dan Carpenter
@ 2017-08-29 20:05 ` Jakub Kicinski
2017-08-29 23:07 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Jakub Kicinski @ 2017-08-29 20:05 UTC (permalink / raw)
To: Dan Carpenter
Cc: David S. Miller, Simon Horman, oss-drivers, netdev,
kernel-janitors
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>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net] nfp: double free on error in probe
2017-08-29 19:15 [PATCH net] nfp: double free on error in probe Dan Carpenter
2017-08-29 20:05 ` Jakub Kicinski
@ 2017-08-29 23:07 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2017-08-29 23:07 UTC (permalink / raw)
To: dan.carpenter
Cc: jakub.kicinski, simon.horman, oss-drivers, netdev,
kernel-janitors
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-08-29 23:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-29 19:15 [PATCH net] nfp: double free on error in probe Dan Carpenter
2017-08-29 20:05 ` Jakub Kicinski
2017-08-29 23:07 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).