DPDK patches and discussions
 help / color / mirror / Atom feed
From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: neil.horman@tuxdriver.com
Subject: [dpdk-dev] [PATCH v2 1/4] eal: fix compile on Fedora 22 (GCC 5.1)
Date: Fri, 29 May 2015 15:34:13 +0100	[thread overview]
Message-ID: <1432910056-6946-2-git-send-email-bruce.richardson@intel.com> (raw)
In-Reply-To: <1432910056-6946-1-git-send-email-bruce.richardson@intel.com>

On Fedora 22, with GCC 5.1, errors are reported due to array accesses
being potentially out of bounds. This commit fixes this by ensuring the
bounds check in the loop takes account of the array size.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 lib/librte_eal/linuxapp/eal/eal_memory.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c
index 5f9f92e..9b8d946 100644
--- a/lib/librte_eal/linuxapp/eal/eal_memory.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
@@ -1188,7 +1188,9 @@ rte_eal_hugepage_init(void)
 		int socket = tmp_hp[i].socket_id;
 
 		/* find a hugepage info with right size and increment num_pages */
-		for (j = 0; j < (int) internal_config.num_hugepage_sizes; j++) {
+		const int nb_hpsizes = RTE_MIN(MAX_HUGEPAGE_SIZES,
+				(int)internal_config.num_hugepage_sizes);
+		for (j = 0; j < nb_hpsizes; j++) {
 			if (tmp_hp[i].size ==
 					internal_config.hugepage_info[j].hugepage_sz) {
 #ifdef RTE_EAL_SINGLE_FILE_SEGMENTS
-- 
2.4.1

  reply	other threads:[~2015-05-29 14:34 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-29 12:53 [dpdk-dev] [PATCH 0/4] fix compilation on Fedora 22 Bruce Richardson
2015-05-29 12:53 ` [dpdk-dev] [PATCH 1/4] eal: fix compile on Fedora 22 (GCC 5.1) Bruce Richardson
2015-05-29 14:07   ` Neil Horman
2015-05-29 12:53 ` [dpdk-dev] [PATCH 2/4] ip_frag: " Bruce Richardson
2015-05-29 14:09   ` Neil Horman
2015-05-29 12:53 ` [dpdk-dev] [PATCH 3/4] i40e: " Bruce Richardson
2015-05-29 12:53 ` [dpdk-dev] [PATCH 4/4] null: " Bruce Richardson
2015-05-29 14:34 ` [dpdk-dev] [PATCH v2 0/4] fix compilation on Fedora 22 Bruce Richardson
2015-05-29 14:34   ` Bruce Richardson [this message]
2015-05-29 14:34   ` [dpdk-dev] [PATCH v2 2/4] ip_frag: fix compile on Fedora 22 (GCC 5.1) Bruce Richardson
2015-05-29 14:34   ` [dpdk-dev] [PATCH v2 3/4] i40e: " Bruce Richardson
2015-05-29 14:34   ` [dpdk-dev] [PATCH v2 4/4] null: " Bruce Richardson
2015-05-29 16:57   ` [dpdk-dev] [PATCH v2 0/4] fix compilation on Fedora 22 Neil Horman
2015-06-03 14:13     ` Thomas Monjalon

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=1432910056-6946-2-git-send-email-bruce.richardson@intel.com \
    --to=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    --cc=neil.horman@tuxdriver.com \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).