net/bnxt: fix a potential resource leak
PATCH 1/1 net/bnxt: fix a potential resource leak
Fix a potential resource leak in case of errors during dev args parsing during device probe.
--- drivers/net/bnxt/bnxt_ethdev.c | 35 +++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-)
drivers/net/bnxt/bnxt_ethdev.c +34 -1
@@ -6285,7 +6285,7 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,struct bnxt *backing_bp;uint16_t num_rep;int i, ret =0 ; -struct rte_kvargs *kvlist; +struct rte_kvargs *kvlist =NULL ; num_rep = eth_da.nb_representor_ports;if (num_rep >BNXT_MAX_VF_REPS ) {
@@ -6339,49 +6339,79 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,* Invoked as for ex: "-w 000:00:0d.0, * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>" */ + ret =rte_kvargs_process (kvlist,BNXT_DEVARG_REP_IS_PF , bnxt_parse_devarg_rep_is_pf, (void *)&representor); +if (ret) { + ret = -EINVAL ; + goto err; + }/* * Handler for "rep_based_pf" devarg. * Invoked as for ex: "-w 000:00:0d.0, * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>" */ + ret =rte_kvargs_process (kvlist,BNXT_DEVARG_REP_BASED_PF , bnxt_parse_devarg_rep_based_pf, (void *)&representor); +if (ret) { + ret = -EINVAL ; + goto err; + }/* * Handler for "rep_based_pf" devarg. * Invoked as for ex: "-w 000:00:0d.0, * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>" */ + ret =rte_kvargs_process (kvlist,BNXT_DEVARG_REP_Q_R2F , bnxt_parse_devarg_rep_q_r2f, (void *)&representor); +if (ret) { + ret = -EINVAL ; + goto err; + }/* * Handler for "rep_based_pf" devarg. * Invoked as for ex: "-w 000:00:0d.0, * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>" */ + ret =rte_kvargs_process (kvlist,BNXT_DEVARG_REP_Q_F2R , bnxt_parse_devarg_rep_q_f2r, (void *)&representor); +if (ret) { + ret = -EINVAL ; + goto err; + }/* * Handler for "rep_based_pf" devarg. * Invoked as for ex: "-w 000:00:0d.0, * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>" */ + ret =rte_kvargs_process (kvlist,BNXT_DEVARG_REP_FC_R2F , bnxt_parse_devarg_rep_fc_r2f, (void *)&representor); +if (ret) { + ret = -EINVAL ; + goto err; + }/* * Handler for "rep_based_pf" devarg. * Invoked as for ex: "-w 000:00:0d.0, * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>" */ + ret =rte_kvargs_process (kvlist,BNXT_DEVARG_REP_FC_F2R , bnxt_parse_devarg_rep_fc_f2r, (void *)&representor); +if (ret) { + ret = -EINVAL ; + goto err; + } } ret = rte_eth_dev_create(&pci_dev->device, name,
@@ -6411,6 +6441,7 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev, } +rte_kvargs_free (kvlist);return 0 ; err:
@@ -6419,6 +6450,8 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,*/ if (num_rep >1 )bnxt_pci_remove_dev_with_reps (backing_eth_dev); + rte_errno = -ret; +rte_kvargs_free (kvlist);return ret; }
Signature · 1 line
2.21.1 (Apple Git-122.3)
Quoted 8 lines · Ajit Khaparde
Fix a potential resource leak in case of errors during dev args parsing during device probe.
Fixes 6dc83230b43b ("net/bnxt: support port representor data path")Signed-off-by Ajit Khaparde <[email protected]>Reviewed-by Kalesh AP <[email protected]>
Patch applied to dpdk-next-net-brcm.
Quoted 117 lines
--- drivers/net/bnxt/bnxt_ethdev.c | 35 +++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-)drivers/net/bnxt/bnxt_ethdev.c +34
-2@@ -6285,7 +6285,7 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,struct bnxt *backing_bp;uint16_t num_rep;int i, ret =0 ; -struct rte_kvargs *kvlist; +struct rte_kvargs *kvlist =NULL ; num_rep = eth_da.nb_representor_ports;if (num_rep >BNXT_MAX_VF_REPS ) {@@ -6339,49 +6339,79 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,* Invoked as for ex: "-w 000:00:0d.0, * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>" */ + ret =rte_kvargs_process (kvlist,BNXT_DEVARG_REP_IS_PF , bnxt_parse_devarg_rep_is_pf, (void *)&representor); +if (ret) { + ret = -EINVAL ; + goto err; + }/* * Handler for "rep_based_pf" devarg. * Invoked as for ex: "-w 000:00:0d.0, * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>" */ + ret =rte_kvargs_process (kvlist,BNXT_DEVARG_REP_BASED_PF , bnxt_parse_devarg_rep_based_pf, (void *)&representor); +if (ret) { + ret = -EINVAL ; + goto err; + }/* * Handler for "rep_based_pf" devarg. * Invoked as for ex: "-w 000:00:0d.0, * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>" */ + ret =rte_kvargs_process (kvlist,BNXT_DEVARG_REP_Q_R2F , bnxt_parse_devarg_rep_q_r2f, (void *)&representor); +if (ret) { + ret = -EINVAL ; + goto err; + }/* * Handler for "rep_based_pf" devarg. * Invoked as for ex: "-w 000:00:0d.0, * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>" */ + ret =rte_kvargs_process (kvlist,BNXT_DEVARG_REP_Q_F2R , bnxt_parse_devarg_rep_q_f2r, (void *)&representor); +if (ret) { + ret = -EINVAL ; + goto err; + }/* * Handler for "rep_based_pf" devarg. * Invoked as for ex: "-w 000:00:0d.0, * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>" */ + ret =rte_kvargs_process (kvlist,BNXT_DEVARG_REP_FC_R2F , bnxt_parse_devarg_rep_fc_r2f, (void *)&representor); +if (ret) { + ret = -EINVAL ; + goto err; + }/* * Handler for "rep_based_pf" devarg. * Invoked as for ex: "-w 000:00:0d.0, * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>" */ + ret =rte_kvargs_process (kvlist,BNXT_DEVARG_REP_FC_F2R , bnxt_parse_devarg_rep_fc_f2r, (void *)&representor); +if (ret) { + ret = -EINVAL ; + goto err; + } } ret = rte_eth_dev_create(&pci_dev->device, name,@@ -6411,6 +6441,7 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev, } +rte_kvargs_free (kvlist);return 0 ; err:@@ -6419,6 +6450,8 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,*/ if (num_rep >1 )bnxt_pci_remove_dev_with_reps (backing_eth_dev); + rte_errno = -ret; +rte_kvargs_free (kvlist);return ret; } --2.21.1 (Apple Git-122.3)
Quoted 25 lines · Ajit Khaparde
Fix a potential resource leak in case of errors during dev args parsing during device probe.
Fixes 6dc83230b43b ("net/bnxt: support port representor data path")Signed-off-by Ajit Khaparde <[email protected]>Reviewed-by Kalesh AP <[email protected]>--- drivers/net/bnxt/bnxt_ethdev.c | 35 +++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-)drivers/net/bnxt/bnxt_ethdev.c +1
-1@@ -6285,7 +6285,7 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,struct bnxt *backing_bp;uint16_t num_rep;int i, ret =0 ; -struct rte_kvargs *kvlist; +struct rte_kvargs *kvlist =NULL ; num_rep = eth_da.nb_representor_ports;if (num_rep >BNXT_MAX_VF_REPS ) {
drivers/net/bnxt/bnxt_ethdev.c static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev, · line 6345
Quoted 7 lines
drivers/net/bnxt/bnxt_ethdev.c +1
-0@@ -6339,49 +6339,79 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,* Invoked as for ex: "-w 000:00:0d.0, * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>" */ + ret =rte_kvargs_process (kvlist,BNXT_DEVARG_REP_IS_PF , bnxt_parse_devarg_rep_is_pf, (void *)&representor);
Hi Ajit,
This is a different syntax, seems repeated a few times below, is it auto generated? Can it be possible to merge the assignment line with the call?
Quoted 37 lines · Ferruh Yigit
Quoted 25 lines · Ajit Khaparde
Fix a potential resource leak in case of errors during dev args parsing during device probe.
Fixes 6dc83230b43b ("net/bnxt: support port representor data path")Signed-off-by Ajit Khaparde <[email protected]>Reviewed-by Kalesh AP <[email protected]>--- drivers/net/bnxt/bnxt_ethdev.c | 35 +++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-)drivers/net/bnxt/bnxt_ethdev.c +1
-1@@ -6285,7 +6285,7 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,struct bnxt *backing_bp;uint16_t num_rep;int i, ret =0 ; -struct rte_kvargs *kvlist; +struct rte_kvargs *kvlist =NULL ; num_rep = eth_da.nb_representor_ports;if (num_rep >BNXT_MAX_VF_REPS ) {drivers/net/bnxt/bnxt_ethdev.c static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev, · line 6345
Quoted 7 lines
drivers/net/bnxt/bnxt_ethdev.c +1
-0@@ -6339,49 +6339,79 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,* Invoked as for ex: "-w 000:00:0d.0, * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>" */ + ret =rte_kvargs_process (kvlist,BNXT_DEVARG_REP_IS_PF , bnxt_parse_devarg_rep_is_pf, (void *)&representor);Hi Ajit,
Quoted 2 lines
This is a different syntax, seems repeated a few times below, is it auto generated? Can it be possible to merge the assignment line with the call?
Done. I tried to improvise unnecessarily to avoid changing multiple lines.
PATCH v2 1/1 net/bnxt: fix a potential resource leak
In reply to Ferruh YigitFix a potential resource leak in case of errors during dev args parsing during device probe.
---v1->v2: addressed the review comment.
--- drivers/net/bnxt/bnxt_ethdev.c | 66 ++++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 19 deletions(-)
drivers/net/bnxt/bnxt_ethdev.c +47 -19
@@ -6285,7 +6285,7 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,struct bnxt *backing_bp;uint16_t num_rep;int i, ret =0 ; -struct rte_kvargs *kvlist; +struct rte_kvargs *kvlist =NULL ; num_rep = eth_da.nb_representor_ports;if (num_rep >BNXT_MAX_VF_REPS ) {
@@ -6339,49 +6339,74 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,* Invoked as for ex: "-w 000:00:0d.0, * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>" */ -rte_kvargs_process (kvlist,BNXT_DEVARG_REP_IS_PF , - bnxt_parse_devarg_rep_is_pf, - (void *)&representor); + ret =rte_kvargs_process (kvlist,BNXT_DEVARG_REP_IS_PF , + bnxt_parse_devarg_rep_is_pf, + (void *)&representor); +if (ret) { + ret = -EINVAL ; + goto err; + }/* * Handler for "rep_based_pf" devarg. * Invoked as for ex: "-w 000:00:0d.0, * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>" */ -rte_kvargs_process (kvlist,BNXT_DEVARG_REP_BASED_PF , - bnxt_parse_devarg_rep_based_pf, - (void *)&representor); + ret =rte_kvargs_process (kvlist, +BNXT_DEVARG_REP_BASED_PF , + bnxt_parse_devarg_rep_based_pf, + (void *)&representor); +if (ret) { + ret = -EINVAL ; + goto err; + }/* * Handler for "rep_based_pf" devarg. * Invoked as for ex: "-w 000:00:0d.0, * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>" */ -rte_kvargs_process (kvlist,BNXT_DEVARG_REP_Q_R2F , - bnxt_parse_devarg_rep_q_r2f, - (void *)&representor); + ret =rte_kvargs_process (kvlist,BNXT_DEVARG_REP_Q_R2F , + bnxt_parse_devarg_rep_q_r2f, + (void *)&representor); +if (ret) { + ret = -EINVAL ; + goto err; + }/* * Handler for "rep_based_pf" devarg. * Invoked as for ex: "-w 000:00:0d.0, * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>" */ -rte_kvargs_process (kvlist,BNXT_DEVARG_REP_Q_F2R , - bnxt_parse_devarg_rep_q_f2r, - (void *)&representor); + ret =rte_kvargs_process (kvlist,BNXT_DEVARG_REP_Q_F2R , + bnxt_parse_devarg_rep_q_f2r, + (void *)&representor); +if (ret) { + ret = -EINVAL ; + goto err; + }/* * Handler for "rep_based_pf" devarg. * Invoked as for ex: "-w 000:00:0d.0, * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>" */ -rte_kvargs_process (kvlist,BNXT_DEVARG_REP_FC_R2F , - bnxt_parse_devarg_rep_fc_r2f, - (void *)&representor); + ret =rte_kvargs_process (kvlist,BNXT_DEVARG_REP_FC_R2F , + bnxt_parse_devarg_rep_fc_r2f, + (void *)&representor); +if (ret) { + ret = -EINVAL ; + goto err; + }/* * Handler for "rep_based_pf" devarg. * Invoked as for ex: "-w 000:00:0d.0, * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>" */ -rte_kvargs_process (kvlist,BNXT_DEVARG_REP_FC_F2R , - bnxt_parse_devarg_rep_fc_f2r, - (void *)&representor); + ret =rte_kvargs_process (kvlist,BNXT_DEVARG_REP_FC_F2R , + bnxt_parse_devarg_rep_fc_f2r, + (void *)&representor); +if (ret) { + ret = -EINVAL ; + goto err; + } } ret = rte_eth_dev_create(&pci_dev->device, name,
@@ -6411,6 +6436,7 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev, } +rte_kvargs_free (kvlist);return 0 ; err:
@@ -6419,6 +6445,8 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,*/ if (num_rep >1 )bnxt_pci_remove_dev_with_reps (backing_eth_dev); + rte_errno = -ret; +rte_kvargs_free (kvlist);return ret; }
Signature · 1 line
2.21.1 (Apple Git-122.3)
Quoted 10 lines · Ajit Khaparde
Fix a potential resource leak in case of errors during dev args parsing during device probe.
Fixes 6dc83230b43b ("net/bnxt: support port representor data path")Signed-off-by Ajit Khaparde <[email protected]>Reviewed-by Kalesh AP <[email protected]>---
v1->v2: addressed the review comment.
Patch applied to dpdk-next-net-brcm.