Skip to contentSkip to conversation

pipeline: fix build with glibc < 2.26

PATCH In review David Marchand 2 participants 3 messages Oct 2, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pipeline: fix build with glibc < 2.26

reallocarray has been introduced in glibc 2.26 but we still support glibc >= 2.7.
Simply replace with realloc, as the considered sizes are unlikely to overflow.

"""
The reallocarray() function changes the size of the memory block pointed to by ptr to be large enough for an array of nmemb elements, each of which is size bytes. It is equivalent to the call

       realloc(ptr, nmemb * size);

However, unlike that realloc() call, reallocarray() fails safely in the case where the multiplication would overflow. If such an over‐ flow occurs, reallocarray() returns NULL, sets errno to ENOMEM, and leaves the original block of memory unchanged.
"""

Fixes 3ca60ceed79a ("pipeline: add SWX pipeline specification file")
---
 lib/librte_pipeline/rte_swx_pipeline_spec.c | 25 +++++++++------------
 1 file changed, 10 insertions(+), 15 deletions(-)
lib/librte_pipeline/rte_swx_pipeline_spec.c +10 -15
index d72badd03d..95de8f983d 100644
@@ -213,9 +213,8 @@ struct_block_parse(struct struct_spec *s,
 		return -ENOMEM;
 	}
 
-	new_fields = reallocarray(s->fields,
-				  s->n_fields + 1,
-				  sizeof(struct rte_swx_field_params));
+	new_fields = realloc(s->fields,
+			     (s->n_fields + 1) * sizeof(struct rte_swx_field_params));
 	if (!new_fields) {
 		free(name);
 
@@ -452,9 +451,8 @@ action_block_parse(struct action_spec *s,
 		return -ENOMEM;
 	}
 
-	new_instructions = reallocarray(s->instructions,
-					s->n_instructions + 1,
-					sizeof(char *));
+	new_instructions = realloc(s->instructions,
+				   (s->n_instructions + 1) * sizeof(char *));
 	if (!new_instructions) {
 		free(instr);
 
@@ -620,9 +618,8 @@ table_key_block_parse(struct table_spec *s,
 		return -ENOMEM;
 	}
 
-	new_fields = reallocarray(s->params.fields,
-				  s->params.n_fields + 1,
-				  sizeof(struct rte_swx_match_field_params));
+	new_fields = realloc(s->params.fields,
+			     (s->params.n_fields + 1) * sizeof(struct rte_swx_match_field_params));
 	if (!new_fields) {
 		free(name);
 
@@ -700,9 +697,8 @@ table_actions_block_parse(struct table_spec *s,
 		return -ENOMEM;
 	}
 
-	new_action_names = reallocarray(s->params.action_names,
-					s->params.n_actions + 1,
-					sizeof(char *));
+	new_action_names = realloc(s->params.action_names,
+				   (s->params.n_actions + 1) * sizeof(char *));
 	if (!new_action_names) {
 		free(name);
 
@@ -1019,9 +1015,8 @@ apply_block_parse(struct apply_spec *s,
 		return -ENOMEM;
 	}
 
-	new_instructions = reallocarray(s->instructions,
-					s->n_instructions + 1,
-					sizeof(char *));
+	new_instructions = realloc(s->instructions,
+				   (s->n_instructions + 1) * sizeof(char *));
 	if (!new_instructions) {
 		free(instr);
 
Signature · 1 line
2.23.0
Acked-by on v1 1/1
#1 lore raw
Quoted 103 lines

-----Original Message-----
From: David Marchand <[email protected]>
Sent: Friday, October 2, 2020 9:29 AM
To: [email protected]
Cc: Dumitrescu, Cristian <[email protected]>
Subject: [PATCH] pipeline: fix build with glibc < 2.26

reallocarray has been introduced in glibc 2.26 but we still support glibc >= 2.7.
Simply replace with realloc, as the considered sizes are unlikely to overflow.

"""
The reallocarray() function changes the size of the memory block pointed to by ptr to be large enough for an array of nmemb elements, each of which is size bytes. It is equivalent to the call

       realloc(ptr, nmemb * size);

However, unlike that realloc() call, reallocarray() fails safely in the case where the multiplication would overflow. If such an over‐ flow occurs, reallocarray() returns NULL, sets errno to ENOMEM, and leaves the original block of memory unchanged.
"""

Fixes 3ca60ceed79a ("pipeline: add SWX pipeline specification file")
---
 lib/librte_pipeline/rte_swx_pipeline_spec.c | 25 +++++++++------------
 1 file changed, 10 insertions(+), 15 deletions(-)
lib/librte_pipeline/rte_swx_pipeline_spec.c +6 -9
index d72badd03d..95de8f983d 100644
@@ -213,9 +213,8 @@ struct_block_parse(struct struct_spec *s,
 		return -ENOMEM;
 	}
 
-	new_fields = reallocarray(s->fields,
-				  s->n_fields + 1,
-				  sizeof(struct rte_swx_field_params));
+	new_fields = realloc(s->fields,
+			     (s->n_fields + 1) * sizeof(struct
 rte_swx_field_params));
 	if (!new_fields) {
 		free(name);
@@ -452,9 +451,8 @@ action_block_parse(struct action_spec *s,
 		return -ENOMEM;
 	}
 
-	new_instructions = reallocarray(s->instructions,
-					s->n_instructions + 1,
-					sizeof(char *));
+	new_instructions = realloc(s->instructions,
+				   (s->n_instructions + 1) * sizeof(char *));
 	if (!new_instructions) {
 		free(instr);
 
@@ -620,9 +618,8 @@ table_key_block_parse(struct table_spec *s,
 		return -ENOMEM;
 	}
 
-	new_fields = reallocarray(s->params.fields,
-				  s->params.n_fields + 1,
-				  sizeof(struct
 rte_swx_match_field_params));
+	new_fields = realloc(s->params.fields,
+			     (s->params.n_fields + 1) * sizeof(struct
 rte_swx_match_field_params));
 	if (!new_fields) {
lib/librte_pipeline/rte_swx_pipeline_spec.c +4 -7
 		free(name);
@@ -700,9 +697,8 @@ table_actions_block_parse(struct table_spec *s,
 		return -ENOMEM;
 	}
 
-	new_action_names = reallocarray(s->params.action_names,
-					s->params.n_actions + 1,
-					sizeof(char *));
+	new_action_names = realloc(s->params.action_names,
+				   (s->params.n_actions + 1) * sizeof(char *));
 	if (!new_action_names) {
 		free(name);
 
@@ -1019,9 +1015,8 @@ apply_block_parse(struct apply_spec *s,
 		return -ENOMEM;
 	}
 
-	new_instructions = reallocarray(s->instructions,
-					s->n_instructions + 1,
-					sizeof(char *));
+	new_instructions = realloc(s->instructions,
+				   (s->n_instructions + 1) * sizeof(char *));
 	if (!new_instructions) {
 		free(instr);
 
--
Quoted 1 line

2.23.0

author Applied
#2 lore raw
Quoted 25 lines · Cristian
Quoted 25 lines

-----Original Message-----
From: David Marchand <[email protected]>
Sent: Friday, October 2, 2020 9:29 AM
To: [email protected]
Cc: Dumitrescu, Cristian <[email protected]>
Subject: [PATCH] pipeline: fix build with glibc < 2.26

reallocarray has been introduced in glibc 2.26 but we still support glibc >= 2.7.
Simply replace with realloc, as the considered sizes are unlikely to overflow.

"""
The reallocarray() function changes the size of the memory block pointed to by ptr to be large enough for an array of nmemb elements, each of which is size bytes. It is equivalent to the call

       realloc(ptr, nmemb * size);

However, unlike that realloc() call, reallocarray() fails safely in the case where the multiplication would overflow. If such an over‐ flow occurs, reallocarray() returns NULL, sets errno to ENOMEM, and leaves the original block of memory unchanged.
"""

Quoted 4 lines
Quoted 3 lines
Fixes 3ca60ceed79a ("pipeline: add SWX pipeline specification file")

Applied.

Signature · 1 line
David Marchand