diff mbox series

pipeline: fix build with glibc < 2.26

Message ID 20201002082831.5352-1-david.marchand@redhat.com (mailing list archive)
State Accepted, archived
Delegated to: David Marchand
Headers show
Series pipeline: fix build with glibc < 2.26 | expand

Checks

Context Check Description
ci/iol-testing warning Testing issues
ci/iol-mellanox-Performance success Performance Testing PASS
ci/travis-robot success Travis build: passed
ci/iol-intel-Performance success Performance 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/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

David Marchand Oct. 2, 2020, 8:28 a.m. UTC
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")

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 lib/librte_pipeline/rte_swx_pipeline_spec.c | 25 +++++++++------------
 1 file changed, 10 insertions(+), 15 deletions(-)

Comments

Dumitrescu, Cristian Oct. 2, 2020, 10:38 a.m. UTC | #1
> -----Original Message-----
> From: David Marchand <david.marchand@redhat.com>
> Sent: Friday, October 2, 2020 9:29 AM
> To: dev@dpdk.org
> Cc: Dumitrescu, Cristian <cristian.dumitrescu@intel.com>
> 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")
> 
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
>  lib/librte_pipeline/rte_swx_pipeline_spec.c | 25 +++++++++------------
>  1 file changed, 10 insertions(+), 15 deletions(-)
> 
> diff --git a/lib/librte_pipeline/rte_swx_pipeline_spec.c
> b/lib/librte_pipeline/rte_swx_pipeline_spec.c
> index d72badd03d..95de8f983d 100644
> --- a/lib/librte_pipeline/rte_swx_pipeline_spec.c
> +++ b/lib/librte_pipeline/rte_swx_pipeline_spec.c
> @@ -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);
> 
> --
> 2.23.0


Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
David Marchand Oct. 2, 2020, 11:50 a.m. UTC | #2
On Fri, Oct 2, 2020 at 12:38 PM Dumitrescu, Cristian
<cristian.dumitrescu@intel.com> wrote:
> > -----Original Message-----
> > From: David Marchand <david.marchand@redhat.com>
> > Sent: Friday, October 2, 2020 9:29 AM
> > To: dev@dpdk.org
> > Cc: Dumitrescu, Cristian <cristian.dumitrescu@intel.com>
> > 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")
> >
> > Signed-off-by: David Marchand <david.marchand@redhat.com>
> Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>

Applied.
diff mbox series

Patch

diff --git a/lib/librte_pipeline/rte_swx_pipeline_spec.c b/lib/librte_pipeline/rte_swx_pipeline_spec.c
index d72badd03d..95de8f983d 100644
--- a/lib/librte_pipeline/rte_swx_pipeline_spec.c
+++ b/lib/librte_pipeline/rte_swx_pipeline_spec.c
@@ -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);