diff options
author | Armin Kuster <akuster@mvista.com> | 2021-09-15 17:04:17 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-30 00:02:22 +0100 |
commit | 5b85cb6b51fae51ae916c72f852fb339192d9555 (patch) | |
tree | f1d6f1c6c906b480526864f554fc8d1fe26c0921 /meta/recipes-devtools/qemu/qemu/CVE-2020-27617.patch | |
parent | 81bb24c0f764fb371a2822649ef92bff208a82a0 (diff) | |
download | poky-5b85cb6b51fae51ae916c72f852fb339192d9555.tar.gz |
qemu: Security fix for CVE-2020-27617
Source: qemu.org
MR: 106462
Type: Security Fix
Disposition: Backport from https://git.qemu.org/?p=qemu.git;a=commit;h=7564bf7701f00214cdc8a678a9f7df765244def1
ChangeID: b9dc1b656c07d6a0aecaf7680ed33801bd5f6352
Description:
Affects qemu < 5.2.0
(From OE-Core rev: be31eb87299b883306c1823ad632d6ada237dc05)
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>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/CVE-2020-27617.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/CVE-2020-27617.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-27617.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-27617.patch new file mode 100644 index 0000000000..7bfc2beecb --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-27617.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From 7564bf7701f00214cdc8a678a9f7df765244def1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Prasad J Pandit <pjp@fedoraproject.org> | ||
3 | Date: Wed, 21 Oct 2020 11:35:50 +0530 | ||
4 | Subject: [PATCH] net: remove an assert call in eth_get_gso_type | ||
5 | |||
6 | eth_get_gso_type() routine returns segmentation offload type based on | ||
7 | L3 protocol type. It calls g_assert_not_reached if L3 protocol is | ||
8 | unknown, making the following return statement unreachable. Remove the | ||
9 | g_assert call, it maybe triggered by a guest user. | ||
10 | |||
11 | Reported-by: Gaoning Pan <pgn@zju.edu.cn> | ||
12 | Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org> | ||
13 | Signed-off-by: Jason Wang <jasowang@redhat.com> | ||
14 | |||
15 | Upsteram-Status: Backport | ||
16 | CVE: CVE-2020-27617 | ||
17 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
18 | |||
19 | --- | ||
20 | net/eth.c | 6 +++--- | ||
21 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
22 | |||
23 | diff --git a/net/eth.c b/net/eth.c | ||
24 | index 0c1d413ee2..1e0821c5f8 100644 | ||
25 | --- a/net/eth.c | ||
26 | +++ b/net/eth.c | ||
27 | @@ -16,6 +16,7 @@ | ||
28 | */ | ||
29 | |||
30 | #include "qemu/osdep.h" | ||
31 | +#include "qemu/log.h" | ||
32 | #include "net/eth.h" | ||
33 | #include "net/checksum.h" | ||
34 | #include "net/tap.h" | ||
35 | @@ -71,9 +72,8 @@ eth_get_gso_type(uint16_t l3_proto, uint8_t *l3_hdr, uint8_t l4proto) | ||
36 | return VIRTIO_NET_HDR_GSO_TCPV6 | ecn_state; | ||
37 | } | ||
38 | } | ||
39 | - | ||
40 | - /* Unsupported offload */ | ||
41 | - g_assert_not_reached(); | ||
42 | + qemu_log_mask(LOG_UNIMP, "%s: probably not GSO frame, " | ||
43 | + "unknown L3 protocol: 0x%04"PRIx16"\n", __func__, l3_proto); | ||
44 | |||
45 | return VIRTIO_NET_HDR_GSO_NONE | ecn_state; | ||
46 | } | ||
47 | -- | ||
48 | 2.25.1 | ||
49 | |||