diff options
author | Armin Kuster <akuster@mvista.com> | 2021-09-15 17:04:18 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-30 00:02:22 +0100 |
commit | 830f96a9c3ac675dce938744ecd26479bcd1883e (patch) | |
tree | f55d9d090b433d73694b3ed9c9cbf42db1a7e011 | |
parent | 5b85cb6b51fae51ae916c72f852fb339192d9555 (diff) | |
download | poky-830f96a9c3ac675dce938744ecd26479bcd1883e.tar.gz |
qemu: Security fix for CVE-2020-28916
Source: qemu.org
MR: 107262
Type: Security Fix
Disposition: Backport from https://git.qemu.org/?p=qemu.git;a=commit;h=c2cb511634012344e3d0fe49a037a33b12d8a98a
ChangeID: 3024b894ab045c1a74ab2276359d5e599ec9e822
Description:
Affects qemu < 5.0.0
(From OE-Core rev: 55aa94e9185ecd93612c64cdd982a89d633284e2)
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/CVE-2020-28916.patch | 48 |
2 files changed, 49 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 3113d638d7..211c03e57b 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -90,6 +90,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ | |||
90 | file://CVE-2020-12829_4.patch \ | 90 | file://CVE-2020-12829_4.patch \ |
91 | file://CVE-2020-12829_5.patch \ | 91 | file://CVE-2020-12829_5.patch \ |
92 | file://CVE-2020-27617.patch \ | 92 | file://CVE-2020-27617.patch \ |
93 | file://CVE-2020-28916.patch \ | ||
93 | " | 94 | " |
94 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" | 95 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" |
95 | 96 | ||
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-28916.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-28916.patch new file mode 100644 index 0000000000..756b1c1495 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-28916.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From c2cb511634012344e3d0fe49a037a33b12d8a98a Mon Sep 17 00:00:00 2001 | ||
2 | From: Prasad J Pandit <pjp@fedoraproject.org> | ||
3 | Date: Wed, 11 Nov 2020 18:36:36 +0530 | ||
4 | Subject: [PATCH] hw/net/e1000e: advance desc_offset in case of null descriptor | ||
5 | |||
6 | While receiving packets via e1000e_write_packet_to_guest() routine, | ||
7 | 'desc_offset' is advanced only when RX descriptor is processed. And | ||
8 | RX descriptor is not processed if it has NULL buffer address. | ||
9 | This may lead to an infinite loop condition. Increament 'desc_offset' | ||
10 | to process next descriptor in the ring to avoid infinite loop. | ||
11 | |||
12 | Reported-by: Cheol-woo Myung <330cjfdn@gmail.com> | ||
13 | Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org> | ||
14 | Signed-off-by: Jason Wang <jasowang@redhat.com> | ||
15 | |||
16 | Upstream-Status: Backport | ||
17 | CVE: CVE-2020-28916 | ||
18 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
19 | |||
20 | --- | ||
21 | hw/net/e1000e_core.c | 8 ++++---- | ||
22 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
23 | |||
24 | diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c | ||
25 | index d8b9e4b2f4..095c01ebc6 100644 | ||
26 | --- a/hw/net/e1000e_core.c | ||
27 | +++ b/hw/net/e1000e_core.c | ||
28 | @@ -1596,13 +1596,13 @@ e1000e_write_packet_to_guest(E1000ECore *core, struct NetRxPkt *pkt, | ||
29 | (const char *) &fcs_pad, e1000x_fcs_len(core->mac)); | ||
30 | } | ||
31 | } | ||
32 | - desc_offset += desc_size; | ||
33 | - if (desc_offset >= total_size) { | ||
34 | - is_last = true; | ||
35 | - } | ||
36 | } else { /* as per intel docs; skip descriptors with null buf addr */ | ||
37 | trace_e1000e_rx_null_descriptor(); | ||
38 | } | ||
39 | + desc_offset += desc_size; | ||
40 | + if (desc_offset >= total_size) { | ||
41 | + is_last = true; | ||
42 | + } | ||
43 | |||
44 | e1000e_write_rx_descr(core, desc, is_last ? core->rx_pkt : NULL, | ||
45 | rss_info, do_ps ? ps_hdr_len : 0, &bastate.written); | ||
46 | -- | ||
47 | 2.25.1 | ||
48 | |||