Commit 94a53a53 authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

test: fix dpdk builds on ubuntu24 



We don't build this files when compiling dpdk from our submodule, so we
only need to patch it when building it in the tests.

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I123364e4cfec9c45a2ef825423938d62e9278d31
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/24211


Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarMichal Berger <michal.berger@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng_liu@hotmail.com>
parent 047e0bd7

test/common/autobuild_common.sh

+3 −0
Original line number Diff line number Diff line
@@ -173,6 +173,9 @@ _build_native_dpdk() { 
			patch -p1 < "$rootdir/test/common/config/pkgdep/patches/dpdk/21.11+/dpdk_qat.patch"

		fi

	fi

	if lt "$dpdk_ver" 24.07.0; then

		patch -p1 < "$rootdir/test/common/config/pkgdep/patches/dpdk/24.03/pcapng-add-memcpy-check.patch"

	fi



	dpdk_kmods="false"

	if [ "$(uname -s)" = "FreeBSD" ]; then

test/common/config/pkgdep/patches/dpdk/24.03/pcapng-add-memcpy-check.patch

0 → 100644
+35 −0
Original line number Diff line number Diff line 
From 06f69f8fdbd218ed7a7d664ee49bd27ee1641cdd Mon Sep 17 00:00:00 2001

From: Stephen Hemminger <stephen@networkplumber.org>

Date: Mon, 20 May 2024 18:01:03 -0700

Subject: [PATCH] pcapng: add memcpy check



When adding option with no data, the rte_pcapng_add_option would

call memcpy with src of NULL and size of zero. This generates a

warning if fortify is enabled.



Bugzilla ID: 1446

Fixes: 8d23ce8f5ee9 ("pcapng: add new library for writing pcapng files")

Cc: stable@dpdk.org



Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

---

 lib/pcapng/rte_pcapng.c | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)



diff --git a/lib/pcapng/rte_pcapng.c b/lib/pcapng/rte_pcapng.c

index f74ec939a9..7254defce7 100644

--- a/lib/pcapng/rte_pcapng.c

+++ b/lib/pcapng/rte_pcapng.c

@@ -128,7 +128,8 @@ pcapng_add_option(struct pcapng_option *popt, uint16_t code,

 {

 	popt->code = code;

 	popt->length = len;

-	memcpy(popt->data, data, len);

+	if (len > 0)

+		memcpy(popt->data, data, len);

 

 	return (struct pcapng_option *)((uint8_t *)popt + pcapng_optlen(len));

 }

-- 

2.43.0