diff mbox series

[v2] net/bnxt: fix a potential resource leak

Message ID 20201023051253.37942-1-ajit.khaparde@broadcom.com (mailing list archive)
State Accepted, archived
Delegated to: Ajit Khaparde
Headers
Series [v2] net/bnxt: fix a potential resource leak |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/Intel-compilation success Compilation OK
ci/iol-testing success Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/travis-robot success Travis build: passed
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS

Commit Message

Ajit Khaparde Oct. 23, 2020, 5:12 a.m. UTC 
  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 <ajit.khaparde@broadcom.com>
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
---
v1->v2: addressed the review comment.
---
 drivers/net/bnxt/bnxt_ethdev.c | 66 ++++++++++++++++++++++++----------
 1 file changed, 47 insertions(+), 19 deletions(-)

Comments

Ajit Khaparde Oct. 23, 2020, 5:17 a.m. UTC | #1 
On Thu, Oct 22, 2020 at 10:12 PM Ajit Khaparde
<ajit.khaparde@broadcom.com> wrote:
>
> 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 <ajit.khaparde@broadcom.com>
> Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
> ---
> v1->v2: addressed the review comment.
Patch applied to dpdk-next-net-brcm.
diff mbox series

Patch

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 562cf14ba4..a0e01d059d 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -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;
 }