3 files changed, 39 insertions, 42 deletions

diff --git a/meta-oe/recipes-benchmark/fio/fio/0001-backend-remove-linux-prctl.h-include-to-fix-musl-con.patch b/meta-oe/recipes-benchmark/fio/fio/0001-backend-remove-linux-prctl.h-include-to-fix-musl-con.patch
new file mode 100644
index 0000000000..9019e06f26
--- /dev/null
+++ b/meta-oe/recipes-benchmark/fio/fio/0001-backend-remove-linux-prctl.h-include-to-fix-musl-con.patch
@@ -0,0 +1,33 @@
+From 82688fff1241549177ed4d55c27c93117d738947 Mon Sep 17 00:00:00 2001
+From: Lucas Hecht <lucas.hecht@agdsn.de>
+Date: Tue, 26 May 2026 18:49:48 +0200
+Subject: [PATCH] backend: remove linux/prctl.h include to fix musl conflict
+
+Building with musl fails due to a duplicate definition of prctl_mm_map.
+This is because musl redefines linux/prctl.h in sys/prctl.h.
+
+This commit removes the linux/prctl.h include.
+
+Fixes: #2096
+
+Upstream-Status: Backport [a84eece62edd46c1f4c8047f1052ac6181fc8b3e]
+Signed-off-by: Lucas Hecht <lucas.hecht@agdsn.de>
+---
+ backend.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/backend.c b/backend.c
+index 230d7fd07965..cfc411531818 100644
+--- a/backend.c
++++ b/backend.c
+@@ -32,7 +32,6 @@
+ #include <pthread.h>
+ 
+ #ifdef CONFIG_LINUX
+-#include <linux/prctl.h>
+ #include <sys/prctl.h>
+ #endif
+ 
+-- 
+2.51.0
+
diff --git a/meta-oe/recipes-benchmark/fio/fio/CVE-2025-10823.patch b/meta-oe/recipes-benchmark/fio/fio/CVE-2025-10823.patch
deleted file mode 100644
index c5813273c7..0000000000
--- a/meta-oe/recipes-benchmark/fio/fio/CVE-2025-10823.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 6a39dfaffdb8a6c2080eec0dc7fb1ee532d54025 Mon Sep 17 00:00:00 2001
-From: Jens Axboe <axboe@kernel.dk>
-Date: Tue, 23 Sep 2025 11:50:46 -0600
-Subject: [PATCH] options: check for NULL input string and fail
-
-Waste of time busy work.
-
-Link: https://github.com/axboe/fio/issues/1982
-
-CVE: CVE-2025-10823
-
-Upstream-Status: Backport
-https://github.com/axboe/fio/commit/6a39dfaffdb8a6c2080eec0dc7fb1ee532d54025
-
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
-Signed-off-by: Saravanan <saravanan.kadambathursubramaniyam@windriver.com>
----
- options.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/options.c b/options.c
-index c35878f..562c5bc 100644
---- a/options.c
-+++ b/options.c
-@@ -1616,6 +1616,9 @@ static int str_buffer_pattern_cb(void *data, const char *input)
-        struct thread_data *td = cb_data_to_td(data);
-        int ret;
- 
-+       if (!input)
-+               return 1;
-+
-        /* FIXME: for now buffer pattern does not support formats */
-        ret = parse_and_fill_pattern_alloc(input, strlen(input),
-                                &td->o.buffer_pattern, NULL, NULL, NULL);
--- 
-2.48.1
-
diff --git a/meta-oe/recipes-benchmark/fio/fio_3.39.bb b/meta-oe/recipes-benchmark/fio/fio_3.42.bb
index 2ca52aaecf..966ae644b4 100644
--- a/meta-oe/recipes-benchmark/fio/fio_3.39.bb
+++ b/meta-oe/recipes-benchmark/fio/fio_3.42.bb
@@ -22,14 +22,14 @@ PACKAGECONFIG_NUMA:armeb = ""
 PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}"
 PACKAGECONFIG[numa] = ",--disable-numa,numactl"
 
-SRC_URI = "git://git.kernel.dk/fio.git;branch=master"
-SRCREV = "a6e474c9e896e4ba1eb40066a03402afb040710a"
-
-SRC_URI += "file://CVE-2025-10823.patch"
+SRC_URI = " \
+    git://git.kernel.dk/fio.git;branch=master;tag=${BP} \
+    file://0001-backend-remove-linux-prctl.h-include-to-fix-musl-con.patch \
+"
+SRCREV = "ab77643023f5d7e3c1b71a7576a564f368bf577a"
 
 UPSTREAM_CHECK_GITTAGREGEX = "fio-(?P<pver>\d+(\.\d+)+)"
 
-
 # avoids build breaks when using no-static-libs.inc
 DISABLE_STATIC = ""
 
@@ -47,3 +47,4 @@ do_install() {
 }
 
 CVE_STATUS[CVE-2025-10824] = "disputed: Maintainer could not reproduce the issue, issue is closed without change."
+CVE_STATUS[CVE-2026-30656] = "fixed-version: fixed in 3.42"