DPDK patches and discussions
 help / color / mirror / Atom feed
From: David Marchand <david.marchand@redhat.com>
To: dev@dpdk.org
Cc: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Subject: [dpdk-dev] [PATCH] pipeline: fix build with glibc < 2.26
Date: Fri,  2 Oct 2020 10:28:31 +0200
Message-ID: <20201002082831.5352-1-david.marchand@redhat.com> (raw)

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


             reply	other threads:[~2020-10-02  8:28 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-02  8:28 David Marchand [this message]
2020-10-02 10:38 ` Dumitrescu, Cristian
2020-10-02 11:50   ` David Marchand

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201002082831.5352-1-david.marchand@redhat.com \
    --to=david.marchand@redhat.com \
    --cc=cristian.dumitrescu@intel.com \
    --cc=dev@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

DPDK patches and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \
		dev@dpdk.org
	public-inbox-index dev

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git