diff --git a/meta-oe/recipes-benchmark/fio/fio/0001-fix-musl-builds.patch b/meta-oe/recipes-benchmark/fio/fio/0001-fix-musl-builds.patch deleted file mode 100644 index 6c0d69d6e8..0000000000 --- a/meta-oe/recipes-benchmark/fio/fio/0001-fix-musl-builds.patch +++ /dev/null @@ -1,38 +0,0 @@ -From ccce76d2850d6e52da3d7986c950af068fbfe0fd Mon Sep 17 00:00:00 2001 -From: Arthur Gautier -Date: Sat, 13 Dec 2025 20:07:11 -0800 -Subject: [PATCH] fix musl builds - -This commit fixes the build on musl which fails with the following -error: -``` -oslib/linux-blkzoned.c: In function 'blkzoned_move_zone_wp': -oslib/linux-blkzoned.c:389:37: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) - 389 | ret = fallocate(fd, FALLOC_FL_ZERO_RANGE, z->wp, length); - | ^~~~~~~~~~~~~~~~~~~~ -oslib/linux-blkzoned.c:389:37: note: each undeclared identifier is reported only once for each function it appears in -make: *** [Makefile:501: oslib/linux-blkzoned.o] Error 1 -make: *** Waiting for unfinished jobs.... -``` - -Upstream-Status: Backport [https://github.com/axboe/fio/commit/ccce76d2850d6e52da3d7986c950af068fbfe0fd] -Signed-off-by: Arthur Gautier ---- - oslib/linux-blkzoned.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/oslib/linux-blkzoned.c b/oslib/linux-blkzoned.c -index 78e25fca..c45ef623 100644 ---- a/oslib/linux-blkzoned.c -+++ b/oslib/linux-blkzoned.c -@@ -25,6 +25,7 @@ - #ifndef BLKFINISHZONE - #define BLKFINISHZONE _IOW(0x12, 136, struct blk_zone_range) - #endif -+#include - - /* - * If the uapi headers installed on the system lacks zone capacity support, --- -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 -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 -Signed-off-by: Saravanan ---- - 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.41.bb b/meta-oe/recipes-benchmark/fio/fio_3.42.bb similarity index 93% rename from meta-oe/recipes-benchmark/fio/fio_3.41.bb rename to meta-oe/recipes-benchmark/fio/fio_3.42.bb index 3f03c41f22..dac7548d08 100644 --- a/meta-oe/recipes-benchmark/fio/fio_3.41.bb +++ b/meta-oe/recipes-benchmark/fio/fio_3.42.bb @@ -24,15 +24,11 @@ PACKAGECONFIG[numa] = ",--disable-numa,numactl" SRC_URI = " \ git://git.kernel.dk/fio.git;branch=master;tag=${BP} \ - file://0001-fix-musl-builds.patch \ " -SRCREV = "ed675d3477a70a42d2e757b713f6c7125a27cdca" - -SRC_URI += "file://CVE-2025-10823.patch" +SRCREV = "ab77643023f5d7e3c1b71a7576a564f368bf577a" UPSTREAM_CHECK_GITTAGREGEX = "fio-(?P\d+(\.\d+)+)" - # avoids build breaks when using no-static-libs.inc DISABLE_STATIC = "" @@ -50,3 +46,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"