Accepting request 1249226 from network

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1249226
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dpdk?expand=0&rev=69

0002-SLE15-SP3-compatibility-patch-for-kni.patch

@@ -1,36 +0,0 @@
-From 430a4b50f2f7e5f21c7c2f81849588c575018501 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jaime=20Caama=C3=B1o=20Ruiz?= <jcaamano@suse.com>
-Date: Mon, 21 Sep 2020 14:50:13 +0200
-Subject: [PATCH] SLE15 SP3 compatibility patch for kni
-
-  Add patch to resolve build error reported in Staging:E project 
-  where a kernel backport (jsc#SLE-13536) introduced backward
-  incompatible changes to the API that break kni module build
-  * 0001-SLE15-SP3-compatibility-patch-for-kni.patch
-
-Updated 2023-02-26 for version 22.11
-
-diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h
-index 3a86d12bbc..66d1afd944 100644
---- a/kernel/linux/kni/compat.h
-+++ b/kernel/linux/kni/compat.h
-@@ -14,7 +14,10 @@
- #define SLE_VERSION(a, b, c) KERNEL_VERSION(a, b, c)
- #endif
- #ifdef CONFIG_SUSE_KERNEL
--#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 57))
-+#if (defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 15 && \
-+     defined(CONFIG_SUSE_PATCHLEVEL) && CONFIG_SUSE_PATCHLEVEL == 3)
-+#define SLE_VERSION_CODE SLE_VERSION(15, 3, 0)
-+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 57))
- /* SLES12SP3 is at least 4.4.57+ based */
- #define SLE_VERSION_CODE SLE_VERSION(12, 3, 0)
- #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 28))
-@@ -132,6 +135,7 @@
- #endif
- 
- #if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE || \
-+	(SLE_VERSION_CODE && SLE_VERSION_CODE == SLE_VERSION(15, 3, 0)) || \
- 	(defined(RHEL_RELEASE_CODE) && \
- 	 RHEL_RELEASE_VERSION(8, 3) <= RHEL_RELEASE_CODE) || \
- 	 (defined(CONFIG_SUSE_KERNEL) && defined(HAVE_ARG_TX_QUEUE))

dpdk-22.11.5.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:916805aee46246b81f71f831221231ef3de9c1f70223d179621980ec5d1bdf73
-size 15617920

dpdk-22.11.6.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b9291448ca0e6beebbafde99d9ba8376722d5e1482e79118b6328f69e9a8e9bf
-size 15626012

dpdk-24.11.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0b1abc1fda430192ac7eb2ac9f8d83f268a32cd1bb7995b1d6ee8009c67f8f8f
+size 17410740

dpdk-CVE-2024-11614.patch

@@ -0,0 +1,35 @@
+From fdf13ea6fede07538fbe5e2a46fa6d4b2368fa81 Mon Sep 17 00:00:00 2001
+From: Olivier Matz <olivier.matz@6wind.com>
+Date: Thu, 28 Nov 2024 12:09:56 +0100
+Subject: net/virtio: fix Rx checksum calculation
+
+If hdr->csum_start is larger than packet length, the len argument passed
+to rte_raw_cksum_mbuf() overflows and causes a segmentation fault.
+
+Ignore checksum computation in this case.
+
+CVE-2024-11614
+
+Fixes: ca7036b4af3a ("vhost: fix offload flags in Rx path")
+
+Signed-off-by: Maxime Gouin <maxime.gouin@6wind.com>
+Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
+Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
+---
+ lib/vhost/virtio_net.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c
+index d764d4bc6a..69901ab3b5 100644
+--- a/lib/vhost/virtio_net.c
++++ b/lib/vhost/virtio_net.c
+@@ -2823,6 +2823,9 @@ vhost_dequeue_offload(struct virtio_net *dev, struct virtio_net_hdr *hdr,
+ 			 */
+ 			uint16_t csum = 0, off;
+ 
++			if (hdr->csum_start >= rte_pktmbuf_pkt_len(m))
++				return;
++
+ 			if (rte_raw_cksum_mbuf(m, hdr->csum_start,
+ 					rte_pktmbuf_pkt_len(m) - hdr->csum_start, &csum) < 0)
+ 				return;

dpdk.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Mon Feb 17 07:38:12 UTC 2025 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Update to LTS version 24.11
+  * Changelog: https://doc.dpdk.org/guides/rel_notes/release_24_11.html
+  * This update fix build with glibc 2.41
+- Use gcc14 on x86_64 SLE15/16 to avoid the inline error
+
+-------------------------------------------------------------------
+Wed Jan  1 13:12:20 UTC 2025 - Duraisankar P <Duraisankar.pitchumani@suse.com>
+
+-  Fix CVE-2024-11614 [bsc#1234718] - Denial Of Service from malicious guest on hypervisors using DPDK Vhost library
+-  Added patch,
+     + dpdk-CVE-2024-11614.patch 
+
+-------------------------------------------------------------------
+Sat Sep 14 12:34:14 UTC 2024 - Dan Partelly <d.partelly@yahoo.com>
+
+- Enable (disabled by default) installation of headers needed
+  to build drivers.
+
+-------------------------------------------------------------------
+Fri Sep 13 05:08:15 UTC 2024 - Duraisankar P <Duraisankar.pitchumani@suse.com>
+
+- Use python macros from build config
+
 -------------------------------------------------------------------
 Thu Sep  5 11:40:32 UTC 2024 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 

dpdk.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package dpdk
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -35,17 +35,24 @@
 %endif
 # This is in sync with <src>/ABI_VERSION
 # TODO: automate this sync
-%define maj 24
+%define maj 25
 %define min 0
 #%%define lname libdpdk-%%{maj}_%%{min}
 %define lname libdpdk-%{maj}
+#
+%if 0%{?sle_version} >= 150600
+%global pprefix python311
+%{?sle15_python_module_pythons}
+%else
+%global pythons python3
+%global pprefix python3
+%endif
 # Add option to build without examples
 %bcond_without examples
 # Add option to build without tools
 %bcond_without tools
-#
 Name:           dpdk%{name_tag}
-Version:        23.11.1
+Version:        24.11
 Release:        0
 Summary:        Set of libraries and drivers for fast packet processing
 License:        BSD-3-Clause AND GPL-2.0-only AND LGPL-2.1-only
@@ -56,6 +63,17 @@ Source:         https://fast.dpdk.org/rel/dpdk-%{version}.tar.xz
 Patch0:         0001-fix-cpu-compatibility.patch
 # PATCH-FIX-UPSTREAM - https://bugs.dpdk.org/show_bug.cgi?id=1530
 Patch1:         0001-examples-vm_power_manager-add-missing-header.patch
+# PATCH-FIX-UPSTREAM - CVE-2024-11614 [bsc#1234718], net/virtio: Fix Denial Of Service from malicious guest on hypervisors using DPDK Vhost library
+Patch2:         dpdk-CVE-2024-11614.patch
+%ifarch x86_64
+%if 0%{suse_version} < 1699
+# Workaround for build failure related to inline error
+BuildRequires:  gcc14
+%endif
+%endif
+BuildRequires:  %{python_module Sphinx}
+BuildRequires:  %{python_module pyelftools >= 0.22}
+BuildRequires:  %{pythons}
 BuildRequires:  binutils
 BuildRequires:  doxygen
 BuildRequires:  fdupes
@@ -66,9 +84,6 @@ BuildRequires:  modutils
 BuildRequires:  patchelf
 BuildRequires:  pesign-obs-integration
 BuildRequires:  pkgconfig
-BuildRequires:  python3
-BuildRequires:  python3-Sphinx
-BuildRequires:  python3-pyelftools >= 0.22
 BuildRequires:  rdma-core-devel
 BuildRequires:  pkgconfig(jansson)
 BuildRequires:  pkgconfig(libcrypto)
@@ -165,7 +180,7 @@ as L2 and L3 forwarding.
 
 %prep
 # can't use %%{name} because of dpdk-thunderx
-%setup -n dpdk-stable-%{version}
+%setup -q -n dpdk-%{version}
 %if 0%{?suse_version} > 1600
 %autopatch -p1
 %else
@@ -184,6 +199,9 @@ sed -i "/performance-thread/d" examples/meson.build
 
 %ifarch x86_64
 export CFLAGS="%{optflags} -U_FORTIFY_SOURCE -msse4"
+%if 0%{suse_version} < 1699
+export CC=gcc-14
+%endif
 %endif
 examples="all"
 for flavor in %{flavors_to_build}; do
@@ -197,6 +215,7 @@ for flavor in %{flavors_to_build}; do
     -Dplatform="%{platform}" \
     -Dcpu_instruction_set=%{machine} \
     -Denable_kmods=true \
+    -Denable_driver_sdk=true \
     -Ddrivers_install_subdir=%{pmddir} \
     -Dkernel_dir="%{_prefix}/src/linux-obj/%{_target_cpu}/$flavor"
   %meson_build

kni-fix-build-with-Linux-6.10.patch

@@ -1,68 +0,0 @@
-From: Jiri Slaby <jslaby@suse.cz>
-Date: Tue, 16 Jul 2024 10:40:26 +0200
-Subject: kni: fix build with Linux 6.10
-Patch-mainline: submitted to dev@dpdk.org, <20240716084414.115852-1-jslaby@suse.cz>
-References: kernel 6.10
-
-6.10 removed the "support" (it was never supported [1]) of separate
-source and build dirs for out of tree modules.
-
-KNI uses "src=" hack for that purpose.
-
-Instead, copy sources to the build dir and don't rely upon the
-unsupported...
-
-Intended esp. for stable/22.11. It should go wherever kni is still in
-the tree.
-
-[1] https://lore.kernel.org/all/CAK7LNAQ47bZpE6c6Yoz-jQS78uU611oZwU8bH+7e=p5zSyADJw@mail.gmail.com/
-
-Signed-off-by: Jiri Slaby <jslaby@suse.cz>
----
- kernel/linux/kni/meson.build | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build
-index 4c90069e..39ca2ade 100644
---- a/kernel/linux/kni/meson.build
-+++ b/kernel/linux/kni/meson.build
-@@ -11,8 +11,8 @@ if run_cmd.stdout().contains('txqueue') == true
-    kmod_cflags = '-DHAVE_ARG_TX_QUEUE'
- endif
- 
--
--kni_mkfile = custom_target('rte_kni_makefile',
-+kni_deps = []
-+kni_deps += custom_target('rte_kni_makefile',
-         output: 'Makefile',
-         command: ['touch', '@OUTPUT@'])
- 
-@@ -22,12 +22,15 @@ kni_sources = files(
-         'Kbuild',
- )
- 
-+foreach file : kni_sources
-+  kni_deps += fs.copyfile(file)
-+endforeach
-+
- custom_target('rte_kni',
-         input: kni_sources,
-         output: 'rte_kni.ko',
-         command: ['make', '-j4', '-C', kernel_build_dir,
-             'M=' + meson.current_build_dir(),
--            'src=' + meson.current_source_dir(),
-             ' '.join(['MODULE_CFLAGS=', kmod_cflags,'-include '])
-             + dpdk_source_root + '/config/rte_config.h' +
-             ' -I' + dpdk_source_root + '/lib/eal/include' +
-@@ -35,7 +38,7 @@ custom_target('rte_kni',
-             ' -I' + dpdk_build_root +
-             ' -I' + meson.current_source_dir(),
-             'modules'] + cross_args,
--        depends: kni_mkfile,
-+        depends: kni_deps,
-         install: install,
-         install_dir: kernel_install_dir,
-         build_by_default: get_option('enable_kmods'))
--- 
-2.45.2
-

kni-fix-build-with-Linux-6.8.patch

@@ -1,45 +0,0 @@
-From: Jiri Slaby <jslaby@suse.cz>
-Date: Tue, 12 Mar 2024 09:49:14 +0100
-Subject: kni: fix build with Linux 6.8
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-Git-repo: git://dpdk.org/dpdk-stable
-Git-commit: 15658afda05f50e69805b891ebb4d2d5c1966d44
-Patch-mainline: yes
-References: kernel 6.8
-
-strlcpy() was removed in commit d26270061ae6 (string: Remove strlcpy()), use
-strscpy() instead.
-
-The patches fixes this:
-kernel/linux/kni/kni_net.c: In function ‘kni_get_drvinfo’:
-kernel/linux/kni/kni_net.c:835:9: error: implicit declaration of function ‘strlcpy’; did you mean ‘strscpy’?
-
-Intended esp. for stable/22.11. It should go wherever kni is still in
-the tree.
-
-Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-Acked-by: Luca Boccassi <bluca@debian.org>
----
- kernel/linux/kni/kni_net.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c
-index 779ee345..c115a728 100644
---- a/kernel/linux/kni/kni_net.c
-+++ b/kernel/linux/kni/kni_net.c
-@@ -832,8 +832,8 @@ static const struct net_device_ops kni_net_netdev_ops = {
- static void kni_get_drvinfo(struct net_device *dev,
- 			    struct ethtool_drvinfo *info)
- {
--	strlcpy(info->version, KNI_VERSION, sizeof(info->version));
--	strlcpy(info->driver, "kni", sizeof(info->driver));
-+	strscpy(info->version, KNI_VERSION, sizeof(info->version));
-+	strscpy(info->driver, "kni", sizeof(info->driver));
- }
- 
- static const struct ethtool_ops kni_net_ethtool_ops = {
--- 
-2.45.2
-

preamble

@@ -1,4 +0,0 @@
-Requires: kernel-%1
-Enhances: kernel-%1
-Supplements: packageand(kernel-%1:%{-n*})
-Conflicts: dpdk-any-kmp