Skip to contentSkip to conversation

app/testpmd: fix memory leak for dscp table

PATCH Applied Jasvinder Singh 4 participants 7 messages Jun 28, 2022 – Jul 7, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 app/testpmd: fix memory leak for dscp table

This patch fixes memory leak reported by coverity.

Coverity issue: 379220

Fixes 9f5488e326d3 ("app/testpmd: support different input color method")
---
 app/test-pmd/cmdline_mtr.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
app/test-pmd/cmdline_mtr.c +5 -1
index b92e66cedb..833273da0d 100644
@@ -131,8 +131,10 @@ parse_input_color_table_entries(char *str, enum rte_color **dscp_table,
 	/* Allocate memory for vlan table */
 	vlan = (enum rte_color *)malloc(MAX_VLAN_TABLE_ENTRIES *
 		sizeof(enum rte_color));
-	if (vlan == NULL)
+	if (vlan == NULL) {
+		free(*dscp_table);
 		return -1;
+	}
 
 	i = 0;
 	while (1) {
@@ -144,6 +146,7 @@ parse_input_color_table_entries(char *str, enum rte_color **dscp_table,
 			vlan[i++] = RTE_COLOR_RED;
 		else {
 			free(vlan);
+			free(*dscp_table);
 			return -1;
 		}
 		if (i == MAX_VLAN_TABLE_ENTRIES)
@@ -152,6 +155,7 @@ parse_input_color_table_entries(char *str, enum rte_color **dscp_table,
 		token = strtok_r(str, PARSE_DELIMITER, &str);
 		if (token == NULL) {
 			free(vlan);
+			free(*dscp_table);
 			return -1;
 		}
 	}
Signature · 1 line
2.34.3
Reviewed-by on v1 1/1
#1 lore raw

Thanks.

Quoted 44 lines · Jasvinder Singh

This patch fixes memory leak reported by coverity.

Coverity issue: 379220

Fixes 9f5488e326d3 ("app/testpmd: support different input color method")
---
  app/test-pmd/cmdline_mtr.c | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
app/test-pmd/cmdline_mtr.c +5 -1
index b92e66cedb..833273da0d 100644
@@ -131,8 +131,10 @@ parse_input_color_table_entries(char *str, enum rte_color **dscp_table,
  	/* Allocate memory for vlan table */
  	vlan = (enum rte_color *)malloc(MAX_VLAN_TABLE_ENTRIES *
  		sizeof(enum rte_color));
-	if (vlan == NULL)
+	if (vlan == NULL) {
+		free(*dscp_table);
  		return -1;
+	}
 
  	i = 0;
  	while (1) {
@@ -144,6 +146,7 @@ parse_input_color_table_entries(char *str, enum rte_color **dscp_table,
  			vlan[i++] = RTE_COLOR_RED;
  		else {
  			free(vlan);
+			free(*dscp_table);
  			return -1;
  		}
  		if (i == MAX_VLAN_TABLE_ENTRIES)
@@ -152,6 +155,7 @@ parse_input_color_table_entries(char *str, enum rte_color **dscp_table,
  		token = strtok_r(str, PARSE_DELIMITER, &str);
  		if (token == NULL) {
  			free(vlan);
+			free(*dscp_table);
  			return -1;
  		}
  	}
#2 lore raw

Hi Jasvinder,

Thanks for the patch.

Quoted 17 lines · Sean

Thanks.

Quoted 12 lines · Jasvinder Singh

This patch fixes memory leak reported by coverity.

Coverity issue: 379220

Fixes 9f5488e326d3 ("app/testpmd: support different input color method")

---
  app/test-pmd/cmdline_mtr.c | 6 +++++-

  1 file changed, 5 insertions(+), 1 deletion(-)
Quoted 14 lines
Quoted 7 lines
app/test-pmd/cmdline_mtr.c +0 -0
index b92e66cedb..833273da0d 100644
@@ -131,8 +131,10 @@ parse_input_color_table_entries(char *str, enum 
 rte_color **dscp_table,
       /* Allocate memory for vlan table */
Quoted 7 lines

      vlan = (enum rte_color *)malloc(MAX_VLAN_TABLE_ENTRIES * sizeof(enum rte_color));
-    if (vlan == NULL)
+    if (vlan == NULL) {
+        free(*dscp_table);
          return -1;
+    }

Did we miss one return at line 129, or is it not required-

	token = strtok_r(str, PARSE_DELIMITER, &str);
	if (token == NULL)
		return 0;
Quoted 20 lines
Quoted 20 lines

        i = 0;
      while (1) {

app/test-pmd/cmdline_mtr.c +1 -0
@@ -144,6 +146,7 @@ parse_input_color_table_entries(char *str, enum 
 rte_color **dscp_table,
               vlan[i++] = RTE_COLOR_RED;
           else {
               free(vlan);
+            free(*dscp_table);
               return -1;
           }

          if (i == MAX_VLAN_TABLE_ENTRIES)

app/test-pmd/cmdline_mtr.c +1 -0
@@ -152,6 +155,7 @@ parse_input_color_table_entries(char *str, enum 
 rte_color **dscp_table,
           token = strtok_r(str, PARSE_DELIMITER, &str);
           if (token == NULL) {
               free(vlan);
+            free(*dscp_table);
               return -1;
           }

      }

#3 lore raw
Quoted 51 lines

-----Original Message-----
From: Singh, Aman Deep <[email protected]>
Sent: Wednesday, June 29, 2022 5:53 PM
To: Morrissey, Sean <[email protected]>; Singh, Jasvinder <[email protected]>; [email protected]
Cc: Zhang, Yuying <[email protected]>; [email protected]
Subject: Re: [PATCH] app/testpmd: fix memory leak for dscp table

Hi Jasvinder,

Thanks for the patch.

Quoted 18 lines · Sean

Thanks.

Quoted 13 lines · Jasvinder Singh

This patch fixes memory leak reported by coverity.

Coverity issue: 379220

Fixes 9f5488e326d3 ("app/testpmd: support different input color

method")

---
  app/test-pmd/cmdline_mtr.c | 6 +++++-

  1 file changed, 5 insertions(+), 1 deletion(-)
Quoted 14 lines
Quoted 7 lines
app/test-pmd/cmdline_mtr.c +0 -0
index b92e66cedb..833273da0d 100644
@@ -131,8 +131,10 @@ parse_input_color_table_entries(char *str, enum
 rte_color **dscp_table,
       /* Allocate memory for vlan table */
Quoted 7 lines

      vlan = (enum rte_color *)malloc(MAX_VLAN_TABLE_ENTRIES * sizeof(enum rte_color));
-    if (vlan == NULL)
+    if (vlan == NULL) {
+        free(*dscp_table);
          return -1;
+    }

Did we miss one return at line 129, or is it not required-

Quoted 4 lines
	token = strtok_r(str, PARSE_DELIMITER, &str);
	if (token == NULL)
		return 0;

No need to free the allocated memory on successful return from the function.

#6 lore raw
Quoted 11 lines · Andrew Rybchenko

In summary: dscp -> DSCP

Quoted 8 lines · Aman Deep
Quoted 5 lines · Jasvinder Singh

This patch fixes memory leak reported by coverity.

Coverity issue: 379220

Fixes 9f5488e326d3 ("app/testpmd: support different input color method")
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

Applied to dpdk-next-net/main, thanks.