Skip to contentSkip to conversation

regex/mlx5: fix RegEx probing error flow

PATCH Applied Michael Baum 4 participants 4 messages Aug 31, 2021 – Sep 22, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 regex/mlx5: fix RegEx probing error flow

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")
---
 drivers/regex/mlx5/mlx5_regex.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regex/mlx5/mlx5_regex.c +1 -1
index f17b6df47f..8866a4d0c6 100644
@@ -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;
Signature · 1 line
2.25.1
Acked-by on v1 1/1
#2 lore raw
In reply to Michael Baum
Quoted 35 lines

-----Original Message-----
From: Michael Baum <[email protected]>

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")
---
 drivers/regex/mlx5/mlx5_regex.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

b/drivers/regex/mlx5/mlx5_regex.c index f17b6df47f..8866a4d0c6 100644

drivers/regex/mlx5/mlx5_regex.c +1 -2
@@ -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;
--
Quoted 1 line

2.25.1

Thanks,

#3 lore raw

01/09/2021 10:11, Ori Kam:

Quoted 10 lines
Quoted 10 lines

From: Michael Baum <[email protected]>

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.

Quoted 7 lines
Quoted 4 lines
Fixes f324162e8e77 ("regex/mlx5: support combined rule file")

Thanks,

Applied, thanks.

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