mem: fix build with gcc 5.1

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>
Acked-by: Neil Horman <nhorman@tuxdriver.com>

diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c
index 5f9f92e1636e3ebba80f29d5d71117986a236c53..9b8d94673070700ff764c6517a43921d11c3664a 100644 (file)
--- 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