diff options
| author | Saravanan <saravanan.kadambathursubramaniyam@windriver.com> | 2025-10-15 11:37:17 +0530 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2025-10-15 12:03:02 -0700 |
| commit | 0fa645bb6999560ffafd5bae3c0bdc51a47b5aae (patch) | |
| tree | f8d84faead9f622f5e132f6a4f8858c8c3d59104 | |
| parent | 7b53cb83bba694a8768d06fc31f63c48cea3459b (diff) | |
| download | meta-openembedded-0fa645bb6999560ffafd5bae3c0bdc51a47b5aae.tar.gz | |
fio: fix CVE-2025-10823
Reference:
https://nvd.nist.gov/vuln/detail/CVE-2025-10823
https://github.com/axboe/fio/issues/1982
Upstream-patch:
https://github.com/axboe/fio/commit/6a39dfaffdb8a6c2080eec0dc7fb1ee532d54025
Signed-off-by: Saravanan <saravanan.kadambathursubramaniyam@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-benchmark/fio/fio/CVE-2025-10823.patch | 37 | ||||
| -rw-r--r-- | meta-oe/recipes-benchmark/fio/fio_3.39.bb | 2 |
2 files changed, 39 insertions, 0 deletions
diff --git a/meta-oe/recipes-benchmark/fio/fio/CVE-2025-10823.patch b/meta-oe/recipes-benchmark/fio/fio/CVE-2025-10823.patch new file mode 100644 index 0000000000..c5813273c7 --- /dev/null +++ b/meta-oe/recipes-benchmark/fio/fio/CVE-2025-10823.patch | |||
| @@ -0,0 +1,37 @@ | |||
| 1 | From 6a39dfaffdb8a6c2080eec0dc7fb1ee532d54025 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jens Axboe <axboe@kernel.dk> | ||
| 3 | Date: Tue, 23 Sep 2025 11:50:46 -0600 | ||
| 4 | Subject: [PATCH] options: check for NULL input string and fail | ||
| 5 | |||
| 6 | Waste of time busy work. | ||
| 7 | |||
| 8 | Link: https://github.com/axboe/fio/issues/1982 | ||
| 9 | |||
| 10 | CVE: CVE-2025-10823 | ||
| 11 | |||
| 12 | Upstream-Status: Backport | ||
| 13 | https://github.com/axboe/fio/commit/6a39dfaffdb8a6c2080eec0dc7fb1ee532d54025 | ||
| 14 | |||
| 15 | Signed-off-by: Jens Axboe <axboe@kernel.dk> | ||
| 16 | Signed-off-by: Saravanan <saravanan.kadambathursubramaniyam@windriver.com> | ||
| 17 | --- | ||
| 18 | options.c | 3 +++ | ||
| 19 | 1 file changed, 3 insertions(+) | ||
| 20 | |||
| 21 | diff --git a/options.c b/options.c | ||
| 22 | index c35878f..562c5bc 100644 | ||
| 23 | --- a/options.c | ||
| 24 | +++ b/options.c | ||
| 25 | @@ -1616,6 +1616,9 @@ static int str_buffer_pattern_cb(void *data, const char *input) | ||
| 26 | struct thread_data *td = cb_data_to_td(data); | ||
| 27 | int ret; | ||
| 28 | |||
| 29 | + if (!input) | ||
| 30 | + return 1; | ||
| 31 | + | ||
| 32 | /* FIXME: for now buffer pattern does not support formats */ | ||
| 33 | ret = parse_and_fill_pattern_alloc(input, strlen(input), | ||
| 34 | &td->o.buffer_pattern, NULL, NULL, NULL); | ||
| 35 | -- | ||
| 36 | 2.48.1 | ||
| 37 | |||
diff --git a/meta-oe/recipes-benchmark/fio/fio_3.39.bb b/meta-oe/recipes-benchmark/fio/fio_3.39.bb index 345c7f08e7..4a94aadf42 100644 --- a/meta-oe/recipes-benchmark/fio/fio_3.39.bb +++ b/meta-oe/recipes-benchmark/fio/fio_3.39.bb | |||
| @@ -25,6 +25,8 @@ PACKAGECONFIG[numa] = ",--disable-numa,numactl" | |||
| 25 | SRC_URI = "git://git.kernel.dk/fio.git;branch=master" | 25 | SRC_URI = "git://git.kernel.dk/fio.git;branch=master" |
| 26 | SRCREV = "a6e474c9e896e4ba1eb40066a03402afb040710a" | 26 | SRCREV = "a6e474c9e896e4ba1eb40066a03402afb040710a" |
| 27 | 27 | ||
| 28 | SRC_URI += "file://CVE-2025-10823.patch" | ||
| 29 | |||
| 28 | UPSTREAM_CHECK_GITTAGREGEX = "fio-(?P<pver>\d+(\.\d+)+)" | 30 | UPSTREAM_CHECK_GITTAGREGEX = "fio-(?P<pver>\d+(\.\d+)+)" |
| 29 | 31 | ||
| 30 | 32 | ||
