diff mbox series

regex/mlx5: fix RegEx probing error flow

Message ID 20210831203838.3411249-1-michaelba@nvidia.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series regex/mlx5: fix RegEx probing error flow |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/github-robot: build success github build: passed
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS

Commit Message

Michael Baum Aug. 31, 2021, 8:38 p.m. UTC 
  In RegEx device probing, there is register read trying after context
device creation.

When the reading fails, the context device was not freed what caused a
memory leak.

Free it.

Fixes: f324162e8e77 ("regex/mlx5: support combined rule file")
Cc: stable@dpdk.org

Signed-off-by: Michael Baum <michaelba@nvidia.com>
---
 drivers/regex/mlx5/mlx5_regex.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Matan Azrad Sept. 1, 2021, 7:47 a.m. UTC | #1 
From: Michael Baum
> In RegEx device probing, there is register read trying after context device
> creation.
> 
> When the reading fails, the context device was not freed what caused a
> memory leak.
> 
> Free it.
> 
> Fixes: f324162e8e77 ("regex/mlx5: support combined rule file")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Michael Baum <michaelba@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
Ori Kam Sept. 1, 2021, 8:11 a.m. UTC | #2 
> -----Original Message-----
> From: Michael Baum <michaelba@nvidia.com>
> 
> In RegEx device probing, there is register read trying after context device
> creation.
> 
> When the reading fails, the context device was not freed what caused a
> memory leak.
> 
> Free it.
> 
> Fixes: f324162e8e77 ("regex/mlx5: support combined rule file")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Michael Baum <michaelba@nvidia.com>
> ---
>  drivers/regex/mlx5/mlx5_regex.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/regex/mlx5/mlx5_regex.c
> b/drivers/regex/mlx5/mlx5_regex.c index f17b6df47f..8866a4d0c6 100644
> --- a/drivers/regex/mlx5/mlx5_regex.c
> +++ b/drivers/regex/mlx5/mlx5_regex.c
> @@ -171,7 +171,7 @@ mlx5_regex_dev_probe(struct rte_device *rte_dev)
>  					    MLX5_RXP_CSR_IDENTIFIER, &val);
>  	if (ret) {
>  		DRV_LOG(ERR, "CSR read failed!");
> -		return -1;
> +		goto dev_error;
>  	}
>  	if (val == MLX5_RXP_BF2_IDENTIFIER)
>  		priv->is_bf2 = 1;
> --
> 2.25.1

Thanks,
Acked-by: Ori Kam <orika@nvidia.com>
Thomas Monjalon Sept. 22, 2021, 7:19 p.m. UTC | #3 
01/09/2021 10:11, Ori Kam:
> > From: Michael Baum <michaelba@nvidia.com>
> > 
> > In RegEx device probing, there is register read trying after context device
> > creation.
> > 
> > When the reading fails, the context device was not freed what caused a
> > memory leak.
> > 
> > Free it.
> > 
> > Fixes: f324162e8e77 ("regex/mlx5: support combined rule file")
> > Cc: stable@dpdk.org
> > 
> > Signed-off-by: Michael Baum <michaelba@nvidia.com>
> 
> Thanks,
> Acked-by: Ori Kam <orika@nvidia.com>

Applied, thanks.

Title changed to:
	regex/mlx5: fix leak after probing failure
diff mbox series

Patch

diff --git a/drivers/regex/mlx5/mlx5_regex.c b/drivers/regex/mlx5/mlx5_regex.c
index f17b6df47f..8866a4d0c6 100644
--- a/drivers/regex/mlx5/mlx5_regex.c
+++ b/drivers/regex/mlx5/mlx5_regex.c
@@ -171,7 +171,7 @@  mlx5_regex_dev_probe(struct rte_device *rte_dev)
 					    MLX5_RXP_CSR_IDENTIFIER, &val);
 	if (ret) {
 		DRV_LOG(ERR, "CSR read failed!");
-		return -1;
+		goto dev_error;
 	}
 	if (val == MLX5_RXP_BF2_IDENTIFIER)
 		priv->is_bf2 = 1;