diff options
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/CVE-2024-4467-0002.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/CVE-2024-4467-0002.patch | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2024-4467-0002.patch b/meta/recipes-devtools/qemu/qemu/CVE-2024-4467-0002.patch deleted file mode 100644 index 686176189c..0000000000 --- a/meta/recipes-devtools/qemu/qemu/CVE-2024-4467-0002.patch +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | From 2eb42a728d27a43fdcad5f37d3f65706ce6deba5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Kevin Wolf <kwolf@redhat.com> | ||
3 | Date: Fri, 16 Aug 2024 09:35:24 +0000 | ||
4 | Subject: [PATCH] iotests/244: Don't store data-file with protocol in image | ||
5 | |||
6 | We want to disable filename parsing for data files because it's too easy | ||
7 | to abuse in malicious image files. Make the test ready for the change by | ||
8 | passing the data file explicitly in command line options. | ||
9 | |||
10 | Cc: qemu-stable@nongnu.org | ||
11 | Signed-off-by: Kevin Wolf <kwolf@redhat.com> | ||
12 | Reviewed-by: Eric Blake <eblake@redhat.com> | ||
13 | Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> | ||
14 | Reviewed-by: Hanna Czenczek <hreitz@redhat.com> | ||
15 | |||
16 | CVE: CVE-2024-4467 | ||
17 | Upstream-Status: Backport [https://gitlab.com/qemu-project/qemu/-/commit/2eb42a728d27a43fdcad5f37d3f65706ce6deba5] | ||
18 | |||
19 | Signed-off-by: Yogita Urade <yogita.urade@windriver.com> | ||
20 | --- | ||
21 | tests/qemu-iotests/244 | 19 ++++++++++++++++--- | ||
22 | 1 file changed, 16 insertions(+), 3 deletions(-) | ||
23 | |||
24 | diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244 | ||
25 | index 3e61fa25b..bb9cc6512 100755 | ||
26 | --- a/tests/qemu-iotests/244 | ||
27 | +++ b/tests/qemu-iotests/244 | ||
28 | @@ -215,9 +215,22 @@ $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n -C "$TEST_IMG.src" "$TEST_IMG" | ||
29 | $QEMU_IMG compare -f $IMGFMT -F $IMGFMT "$TEST_IMG.src" "$TEST_IMG" | ||
30 | |||
31 | # blkdebug doesn't support copy offloading, so this tests the error path | ||
32 | -$QEMU_IMG amend -f $IMGFMT -o "data_file=blkdebug::$TEST_IMG.data" "$TEST_IMG" | ||
33 | -$QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n -C "$TEST_IMG.src" "$TEST_IMG" | ||
34 | -$QEMU_IMG compare -f $IMGFMT -F $IMGFMT "$TEST_IMG.src" "$TEST_IMG" | ||
35 | +test_img_with_blkdebug="json:{ | ||
36 | + 'driver': 'qcow2', | ||
37 | + 'file': { | ||
38 | + 'driver': 'file', | ||
39 | + 'filename': '$TEST_IMG' | ||
40 | + }, | ||
41 | + 'data-file': { | ||
42 | + 'driver': 'blkdebug', | ||
43 | + 'image': { | ||
44 | + 'driver': 'file', | ||
45 | + 'filename': '$TEST_IMG.data' | ||
46 | + } | ||
47 | + } | ||
48 | +}" | ||
49 | +$QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n -C "$TEST_IMG.src" "$test_img_with_blkdebug" | ||
50 | +$QEMU_IMG compare -f $IMGFMT -F $IMGFMT "$TEST_IMG.src" "$test_img_with_blkdebug" | ||
51 | |||
52 | echo | ||
53 | echo "=== Flushing should flush the data file ===" | ||
54 | -- | ||
55 | 2.40.0 | ||