mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-07 05:10:20 +00:00
fio: upgrade 3.41 -> 3.42
Contains fix for CVE-2026-30656. Also mark this CVE as patched explicitly, as NVD tracks it without version info. Drop patches that are included in this release. Changelog: https://github.com/axboe/fio/releases/tag/fio-3.42 Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> fio Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
@@ -1,38 +0,0 @@
|
|||||||
From ccce76d2850d6e52da3d7986c950af068fbfe0fd Mon Sep 17 00:00:00 2001
|
|
||||||
From: Arthur Gautier <arthur.gautier@arista.com>
|
|
||||||
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 <arthur.gautier@arista.com>
|
|
||||||
---
|
|
||||||
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 <linux/falloc.h>
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If the uapi headers installed on the system lacks zone capacity support,
|
|
||||||
--
|
|
||||||
2.51.0
|
|
||||||
|
|
||||||
@@ -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
|
|
||||||
|
|
||||||
+2
-5
@@ -24,15 +24,11 @@ PACKAGECONFIG[numa] = ",--disable-numa,numactl"
|
|||||||
|
|
||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
git://git.kernel.dk/fio.git;branch=master;tag=${BP} \
|
git://git.kernel.dk/fio.git;branch=master;tag=${BP} \
|
||||||
file://0001-fix-musl-builds.patch \
|
|
||||||
"
|
"
|
||||||
SRCREV = "ed675d3477a70a42d2e757b713f6c7125a27cdca"
|
SRCREV = "ab77643023f5d7e3c1b71a7576a564f368bf577a"
|
||||||
|
|
||||||
SRC_URI += "file://CVE-2025-10823.patch"
|
|
||||||
|
|
||||||
UPSTREAM_CHECK_GITTAGREGEX = "fio-(?P<pver>\d+(\.\d+)+)"
|
UPSTREAM_CHECK_GITTAGREGEX = "fio-(?P<pver>\d+(\.\d+)+)"
|
||||||
|
|
||||||
|
|
||||||
# avoids build breaks when using no-static-libs.inc
|
# avoids build breaks when using no-static-libs.inc
|
||||||
DISABLE_STATIC = ""
|
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-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"
|
||||||
Reference in New Issue
Block a user