net/bnxt: fix a potential resource leak
diff mbox series

Message ID 20201021060032.23833-1-ajit.khaparde@broadcom.com
State Changes Requested, archived
Delegated to: Ajit Khaparde
Headers show
Series
  • net/bnxt: fix a potential resource leak
Related show

Checks

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

Commit Message

Ajit Khaparde Oct. 21, 2020, 6 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>
---
 drivers/net/bnxt/bnxt_ethdev.c | 35 +++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

Comments

Ajit Khaparde Oct. 21, 2020, 2:04 p.m. UTC | #1
On Tue, Oct 20, 2020 at 11:00 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>
Patch applied to dpdk-next-net-brcm.

> ---
>  drivers/net/bnxt/bnxt_ethdev.c | 35 +++++++++++++++++++++++++++++++++-
>  1 file changed, 34 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
> index 562cf14ba..aa2d9e00e 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,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)
>
Ferruh Yigit Oct. 22, 2020, 11:47 a.m. UTC | #2
On 10/21/2020 7:00 AM, Ajit Khaparde 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>
> ---
>   drivers/net/bnxt/bnxt_ethdev.c | 35 +++++++++++++++++++++++++++++++++-
>   1 file changed, 34 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
> index 562cf14ba..aa2d9e00e 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,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?
Ajit Khaparde Oct. 23, 2020, 5:11 a.m. UTC | #3
On Thu, Oct 22, 2020 at 4:47 AM Ferruh Yigit <ferruh.yigit@intel.com> wrote:
>
> On 10/21/2020 7:00 AM, Ajit Khaparde 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>
> > ---
> >   drivers/net/bnxt/bnxt_ethdev.c | 35 +++++++++++++++++++++++++++++++++-
> >   1 file changed, 34 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
> > index 562cf14ba..aa2d9e00e 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,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?
Done. I tried to improvise unnecessarily to avoid changing multiple lines.

Patch
diff mbox series

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 562cf14ba..aa2d9e00e 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,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;
 }