> -----Original Message----- > From: David Marchand <david.march...@redhat.com> > Sent: Friday, October 2, 2020 9:29 AM > To: dev@dpdk.org > Cc: Dumitrescu, Cristian <cristian.dumitre...@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.march...@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.dumitre...@intel.com>