]> git.droids-corp.org - dpdk.git/commitdiff
net/ice: fix build with GCC 12
authorDavid Marchand <david.marchand@redhat.com>
Wed, 18 May 2022 10:16:51 +0000 (12:16 +0200)
committerDavid Marchand <david.marchand@redhat.com>
Wed, 15 Jun 2022 08:20:36 +0000 (10:20 +0200)
GCC 12 raises the following warning:

In file included from ../lib/mempool/rte_mempool.h:46,
                 from ../lib/mbuf/rte_mbuf.h:38,
                 from ../lib/net/rte_ether.h:22,
                 from ../lib/ethdev/rte_ethdev.h:172,
                 from ../lib/ethdev/ethdev_driver.h:22,
                 from ../lib/ethdev/ethdev_pci.h:17,
                 from ../drivers/net/ice/ice_ethdev.c:6:
../drivers/net/ice/ice_ethdev.c: In function ‘ice_dev_configure’:
../lib/eal/x86/include/rte_memcpy.h:370:9: warning: array subscript 64 is
        outside array bounds of ‘struct ice_aqc_get_set_rss_keys[1]’
        [-Warray-bounds]
  370 | rte_mov32((uint8_t *)dst + 2 * 32, (const uint8_t *)src + 2 * 32);
      | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/net/ice/ice_ethdev.c:3202:41: note: while referencing ‘key’
 3202 |         struct ice_aqc_get_set_rss_keys key;
      |                                         ^~~

Restrict copy to minimum size.

Bugzilla ID: 850
Cc: stable@dpdk.org
Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
drivers/net/ice/ice_ethdev.c

index 35ab542e61d47aa1b4f351cf868a538a6bd6c41b..4c658ce3dc7ab1d344cae7e391671182efef14b1 100644 (file)
@@ -3282,7 +3282,8 @@ static int ice_init_rss(struct ice_pf *pf)
                           RTE_MIN(rss_conf->rss_key_len,
                                   vsi->rss_key_size));
 
-       rte_memcpy(key.standard_rss_key, vsi->rss_key, vsi->rss_key_size);
+       rte_memcpy(key.standard_rss_key, vsi->rss_key,
+               RTE_MIN(sizeof(key.standard_rss_key), vsi->rss_key_size));
        ret = ice_aq_set_rss_key(hw, vsi->idx, &key);
        if (ret)
                goto out;