57 lines
2.1 KiB
Diff
57 lines
2.1 KiB
Diff
From ec6a2fa05c425c42071d164c82d46d0f62ff2e1c Mon Sep 17 00:00:00 2001
|
||
From: David Marchand <david.marchand@redhat.com>
|
||
Date: Wed, 18 May 2022 12:16:51 +0200
|
||
Subject: [PATCH] net/ice: fix build with GCC 12
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
[ upstream commit 20d6a017e148cc1944d85d4c80a0151a5b4c6436 ]
|
||
|
||
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
|
||
|
||
Signed-off-by: David Marchand <david.marchand@redhat.com>
|
||
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
|
||
---
|
||
drivers/net/ice/ice_ethdev.c | 3 ++-
|
||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
||
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
|
||
index ab3976a319..7df1b4ec19 100644
|
||
--- a/drivers/net/ice/ice_ethdev.c
|
||
+++ b/drivers/net/ice/ice_ethdev.c
|
||
@@ -3235,7 +3235,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;
|
||
--
|
||
2.23.0
|
||
|