diff mbox series

[2/3] ipsec: compilation fix for GCC-12

Message ID 20220804134055.1816993-2-amitprakashs@marvell.com (mailing list archive)
State Accepted, archived
Delegated to: akhil goyal
Headers
Series [1/3] test/test_ipsec: compilation fix for GCC-12 |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Amit Prakash Shukla Aug. 4, 2022, 1:40 p.m. UTC 
  GCC 12 raises the following warning:

In file included from ../lib/eal/x86/include/rte_atomic.h:15,
                 from ../lib/eal/include/generic/rte_pause.h:19,
                 from ../lib/eal/x86/include/rte_pause.h:12,
                 from ../lib/eal/include/generic/rte_spinlock.h:25,
                 from ../lib/eal/x86/include/rte_spinlock.h:12,
                 from ../lib/mempool/rte_mempool.h:43,
                 from ../lib/mbuf/rte_mbuf.h:38,
                 from ../lib/cryptodev/rte_crypto.h:20,
                 from ../lib/cryptodev/rte_cryptodev.h:22,
                 from ../lib/ipsec/rte_ipsec_sa.h:15,
                 from ../lib/ipsec/rte_ipsec.h:17,
                 from ../lib/ipsec/esp_outb.c:5:
In function '_mm_loadu_si128',
    inlined from 'rte_mov16' at
	../lib/eal/x86/include/rte_memcpy.h:507:9,
    inlined from 'rte_mov128' at
	../lib/eal/x86/include/rte_memcpy.h:549:2,
    inlined from 'rte_memcpy_generic' at
	../lib/eal/x86/include/rte_memcpy.h:732:4,
    inlined from 'rte_memcpy' at
	../lib/eal/x86/include/rte_memcpy.h:882:10,
    inlined from 'outb_tun_pkt_prepare' at
	../lib/ipsec/esp_outb.c:224:2:
/usr/lib/gcc/x86_64-pc-linux-gnu/12.1.1/include/emmintrin.h:703:10: error:
	array subscript '__m128i_u[15]' is partly outside array bounds of
	'const uint8_t[255]' {aka 'const unsigned char[255]'}
	[-Werror=array-bounds]
  703 |   return *__P;
      |          ^~~~
In file included from ../lib/ipsec/esp_outb.c:17:
../lib/ipsec/pad.h: In function 'outb_tun_pkt_prepare':
../lib/ipsec/pad.h:10:22: note: at offset 240 into object 'esp_pad_bytes'
	of size 255
   10 | static const uint8_t esp_pad_bytes[IPSEC_MAX_PAD_SIZE] = {
      |                      ^~~~~~~~~~~~~
In function '_mm_loadu_si128',
    inlined from 'rte_mov16' at
	../lib/eal/x86/include/rte_memcpy.h:507:9,
    inlined from 'rte_mov128' at
	../lib/eal/x86/include/rte_memcpy.h:549:2,
    inlined from 'rte_memcpy_generic' at
	../lib/eal/x86/include/rte_memcpy.h:732:4,
    inlined from 'rte_memcpy' at
	../lib/eal/x86/include/rte_memcpy.h:882:10,
    inlined from 'outb_trs_pkt_prepare' at
	../lib/ipsec/esp_outb.c:421:2:
/usr/lib/gcc/x86_64-pc-linux-gnu/12.1.1/include/emmintrin.h:703:10: error:
	array subscript '__m128i_u[15]' is partly outside array bounds of
	'const uint8_t[255]' {aka 'const unsigned char[255]'}
	[-Werror=array-bounds]
  703 |   return *__P;
      |          ^~~~
../lib/ipsec/pad.h: In function 'outb_trs_pkt_prepare':
../lib/ipsec/pad.h:10:22: note: at offset 240 into object 'esp_pad_bytes'
	of size 255
   10 | static const uint8_t esp_pad_bytes[IPSEC_MAX_PAD_SIZE] = {
      |                      ^~~~~~~~~~~~~

Restrict copy to minimum size.

Bugzilla ID: 1060
Fixes: 6015e6a13398 ("ipsec: move inbound and outbound code")
Cc: stable@dpdk.org

Signed-off-by: Amit Prakash Shukla <amitprakashs@marvell.com>
---
 lib/ipsec/esp_outb.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Comments

Konstantin Ananyev Aug. 7, 2022, 1:17 p.m. UTC | #1 
04/08/2022 14:40, Amit Prakash Shukla пишет:
> GCC 12 raises the following warning:
> 
> In file included from ../lib/eal/x86/include/rte_atomic.h:15,
>                   from ../lib/eal/include/generic/rte_pause.h:19,
>                   from ../lib/eal/x86/include/rte_pause.h:12,
>                   from ../lib/eal/include/generic/rte_spinlock.h:25,
>                   from ../lib/eal/x86/include/rte_spinlock.h:12,
>                   from ../lib/mempool/rte_mempool.h:43,
>                   from ../lib/mbuf/rte_mbuf.h:38,
>                   from ../lib/cryptodev/rte_crypto.h:20,
>                   from ../lib/cryptodev/rte_cryptodev.h:22,
>                   from ../lib/ipsec/rte_ipsec_sa.h:15,
>                   from ../lib/ipsec/rte_ipsec.h:17,
>                   from ../lib/ipsec/esp_outb.c:5:
> In function '_mm_loadu_si128',
>      inlined from 'rte_mov16' at
> 	../lib/eal/x86/include/rte_memcpy.h:507:9,
>      inlined from 'rte_mov128' at
> 	../lib/eal/x86/include/rte_memcpy.h:549:2,
>      inlined from 'rte_memcpy_generic' at
> 	../lib/eal/x86/include/rte_memcpy.h:732:4,
>      inlined from 'rte_memcpy' at
> 	../lib/eal/x86/include/rte_memcpy.h:882:10,
>      inlined from 'outb_tun_pkt_prepare' at
> 	../lib/ipsec/esp_outb.c:224:2:
> /usr/lib/gcc/x86_64-pc-linux-gnu/12.1.1/include/emmintrin.h:703:10: error:
> 	array subscript '__m128i_u[15]' is partly outside array bounds of
> 	'const uint8_t[255]' {aka 'const unsigned char[255]'}
> 	[-Werror=array-bounds]
>    703 |   return *__P;
>        |          ^~~~
> In file included from ../lib/ipsec/esp_outb.c:17:
> ../lib/ipsec/pad.h: In function 'outb_tun_pkt_prepare':
> ../lib/ipsec/pad.h:10:22: note: at offset 240 into object 'esp_pad_bytes'
> 	of size 255
>     10 | static const uint8_t esp_pad_bytes[IPSEC_MAX_PAD_SIZE] = {
>        |                      ^~~~~~~~~~~~~
> In function '_mm_loadu_si128',
>      inlined from 'rte_mov16' at
> 	../lib/eal/x86/include/rte_memcpy.h:507:9,
>      inlined from 'rte_mov128' at
> 	../lib/eal/x86/include/rte_memcpy.h:549:2,
>      inlined from 'rte_memcpy_generic' at
> 	../lib/eal/x86/include/rte_memcpy.h:732:4,
>      inlined from 'rte_memcpy' at
> 	../lib/eal/x86/include/rte_memcpy.h:882:10,
>      inlined from 'outb_trs_pkt_prepare' at
> 	../lib/ipsec/esp_outb.c:421:2:
> /usr/lib/gcc/x86_64-pc-linux-gnu/12.1.1/include/emmintrin.h:703:10: error:
> 	array subscript '__m128i_u[15]' is partly outside array bounds of
> 	'const uint8_t[255]' {aka 'const unsigned char[255]'}
> 	[-Werror=array-bounds]
>    703 |   return *__P;
>        |          ^~~~
> ../lib/ipsec/pad.h: In function 'outb_trs_pkt_prepare':
> ../lib/ipsec/pad.h:10:22: note: at offset 240 into object 'esp_pad_bytes'
> 	of size 255
>     10 | static const uint8_t esp_pad_bytes[IPSEC_MAX_PAD_SIZE] = {
>        |                      ^~~~~~~~~~~~~
> 
> Restrict copy to minimum size.
> 
> Bugzilla ID: 1060
> Fixes: 6015e6a13398 ("ipsec: move inbound and outbound code")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Amit Prakash Shukla <amitprakashs@marvell.com>
> ---
>   lib/ipsec/esp_outb.c | 8 ++++++--
>   1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/ipsec/esp_outb.c b/lib/ipsec/esp_outb.c
> index 672e56aba0..aa18c89468 100644
> --- a/lib/ipsec/esp_outb.c
> +++ b/lib/ipsec/esp_outb.c
> @@ -220,8 +220,10 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,
>   	/* pad length */
>   	pdlen -= sizeof(*espt);
>   
> +	RTE_ASSERT(pdlen <= sizeof(esp_pad_bytes));
> +
>   	/* copy padding data */
> -	rte_memcpy(pt, esp_pad_bytes, pdlen);
> +	rte_memcpy(pt, esp_pad_bytes, RTE_MIN(pdlen, sizeof(esp_pad_bytes)));
>   
>   	/* update esp trailer */
>   	espt = (struct rte_esp_tail *)(pt + pdlen);
> @@ -417,8 +419,10 @@ outb_trs_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,
>   	/* pad length */
>   	pdlen -= sizeof(*espt);
>   
> +	RTE_ASSERT(pdlen <= sizeof(esp_pad_bytes));
> +
>   	/* copy padding data */
> -	rte_memcpy(pt, esp_pad_bytes, pdlen);
> +	rte_memcpy(pt, esp_pad_bytes, RTE_MIN(pdlen, sizeof(esp_pad_bytes)));
>   
>   	/* update esp trailer */
>   	espt = (struct rte_esp_tail *)(pt + pdlen);


Acked-by: Konstantin Ananyev <konstantin.v.ananyev@yandex.ru>
diff mbox series

Patch

diff --git a/lib/ipsec/esp_outb.c b/lib/ipsec/esp_outb.c
index 672e56aba0..aa18c89468 100644
--- a/lib/ipsec/esp_outb.c
+++ b/lib/ipsec/esp_outb.c
@@ -220,8 +220,10 @@  outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,
 	/* pad length */
 	pdlen -= sizeof(*espt);
 
+	RTE_ASSERT(pdlen <= sizeof(esp_pad_bytes));
+
 	/* copy padding data */
-	rte_memcpy(pt, esp_pad_bytes, pdlen);
+	rte_memcpy(pt, esp_pad_bytes, RTE_MIN(pdlen, sizeof(esp_pad_bytes)));
 
 	/* update esp trailer */
 	espt = (struct rte_esp_tail *)(pt + pdlen);
@@ -417,8 +419,10 @@  outb_trs_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,
 	/* pad length */
 	pdlen -= sizeof(*espt);
 
+	RTE_ASSERT(pdlen <= sizeof(esp_pad_bytes));
+
 	/* copy padding data */
-	rte_memcpy(pt, esp_pad_bytes, pdlen);
+	rte_memcpy(pt, esp_pad_bytes, RTE_MIN(pdlen, sizeof(esp_pad_bytes)));
 
 	/* update esp trailer */
 	espt = (struct rte_esp_tail *)(pt + pdlen);