diff options
author | Yogita Urade <yogita.urade@windriver.com> | 2023-10-05 11:12:52 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-10-06 11:51:11 +0100 |
commit | ba7ac22f2ed783fd4b304c4e3ca0d1203475a81f (patch) | |
tree | 8f09385fe2e669929a785ee6095ec28603224759 /meta/recipes-devtools/qemu | |
parent | 3ddddfc14f805fe7572bba129605869fb848fed4 (diff) | |
download | poky-ba7ac22f2ed783fd4b304c4e3ca0d1203475a81f.tar.gz |
qemu: fix CVE-2023-42467
QEMU through 8.0.0 could trigger a division by zero in scsi_disk_reset
in hw/scsi/scsi-disk.c because scsi_disk_emulate_mode_select does not
prevent s->qdev.blocksize from being 256. This stops QEMU and the guest
immediately.
References:
https://nvd.nist.gov/vuln/detail/CVE-2023-42467
https://gitlab.com/qemu-project/qemu/-/issues/1813
(From OE-Core rev: 7c42b976d7a72acf917bae9d055768a1350e507d)
Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/CVE-2023-42467.patch | 49 |
2 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 9664b747b3..b331f87c0d 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -35,6 +35,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ | |||
35 | file://fixmips.patch \ | 35 | file://fixmips.patch \ |
36 | file://qemu-guest-agent.init \ | 36 | file://qemu-guest-agent.init \ |
37 | file://qemu-guest-agent.udev \ | 37 | file://qemu-guest-agent.udev \ |
38 | file://CVE-2023-42467.patch \ | ||
38 | " | 39 | " |
39 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" | 40 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" |
40 | 41 | ||
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2023-42467.patch b/meta/recipes-devtools/qemu/qemu/CVE-2023-42467.patch new file mode 100644 index 0000000000..86ab7cf81a --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2023-42467.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From 7cfcc79b0ab800959716738aff9419f53fc68c9c Mon Sep 17 00:00:00 2001 | ||
2 | From: Thomas Huth <thuth@redhat.com> | ||
3 | Date: Thu, 5 Oct 2023 06:01:10 +0000 | ||
4 | Subject: [PATCH] hw/scsi/scsi-disk: Disallow block sizes smaller than 512 | ||
5 | [CVE-2023-42467] | ||
6 | |||
7 | We are doing things like | ||
8 | |||
9 | nb_sectors /= (s->qdev.blocksize / BDRV_SECTOR_SIZE); | ||
10 | |||
11 | in the code here (e.g. in scsi_disk_emulate_mode_sense()), so if | ||
12 | the blocksize is smaller than BDRV_SECTOR_SIZE (=512), this crashes | ||
13 | with a division by 0 exception. Thus disallow block sizes of 256 | ||
14 | bytes to avoid this situation. | ||
15 | |||
16 | Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1813 | ||
17 | CVE: 2023-42467 | ||
18 | Signed-off-by: Thomas Huth <thuth@redhat.com> | ||
19 | Message-ID: <20230925091854.49198-1-thuth@redhat.com> | ||
20 | Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> | ||
21 | |||
22 | CVE: CVE-2023-42467 | ||
23 | |||
24 | Upstream-Status: Backport [https://gitlab.com/qemu-project/qemu/-/commit/7cfcc79b0ab800959716738aff9419f53fc68c9c] | ||
25 | |||
26 | Signed-off-by: Yogita Urade <yogita.urade@windriver.com> | ||
27 | --- | ||
28 | hw/scsi/scsi-disk.c | 5 +++-- | ||
29 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
30 | |||
31 | diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c | ||
32 | index e0d79c796..477ee2bcd 100644 | ||
33 | --- a/hw/scsi/scsi-disk.c | ||
34 | +++ b/hw/scsi/scsi-disk.c | ||
35 | @@ -1628,9 +1628,10 @@ static void scsi_disk_emulate_mode_select(SCSIDiskReq *r, uint8_t *inbuf) | ||
36 | * Since the existing code only checks/updates bits 8-15 of the block | ||
37 | * size, restrict ourselves to the same requirement for now to ensure | ||
38 | * that a block size set by a block descriptor and then read back by | ||
39 | - * a subsequent SCSI command will be the same | ||
40 | + * a subsequent SCSI command will be the same. Also disallow a block | ||
41 | + * size of 256 since we cannot handle anything below BDRV_SECTOR_SIZE. | ||
42 | */ | ||
43 | - if (bs && !(bs & ~0xff00) && bs != s->qdev.blocksize) { | ||
44 | + if (bs && !(bs & ~0xfe00) && bs != s->qdev.blocksize) { | ||
45 | s->qdev.blocksize = bs; | ||
46 | trace_scsi_disk_mode_select_set_blocksize(s->qdev.blocksize); | ||
47 | } | ||
48 | -- | ||
49 | 2.40.0 | ||