diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-15 15:57:03 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-16 08:29:59 +0100 |
commit | d9aa32dbf9145d25565a17ac39b186e332ed9a12 (patch) | |
tree | 5d1c158c2e9c06265965641f638372a1e63c5135 /meta/recipes-devtools/qemu/qemu/CVE-2021-3416_2.patch | |
parent | a9e49336dcddf8b2a43116e7850c3e731786fb86 (diff) | |
download | poky-d9aa32dbf9145d25565a17ac39b186e332ed9a12.tar.gz |
qemu: Upgrade 5.2.0 -> 6.0.0
Building without PIE support seems broken upstream, enable it by default
to match the configuration others evidently use.
Tweak git submodule option to match upstream.
Drop backported/merged patches, refresh others.
(From OE-Core rev: ede1b86e663f1cafccc8aa8c35fa13ebd3f55d11)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/CVE-2021-3416_2.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/CVE-2021-3416_2.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_2.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_2.patch deleted file mode 100644 index 5e53e20bac..0000000000 --- a/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_2.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From e2a48a3c7cc33dbbe89f896e0f07462cb04ff6b5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jason Wang <jasowang@redhat.com> | ||
3 | Date: Wed, 24 Feb 2021 12:13:22 +0800 | ||
4 | Subject: [PATCH 02/10] e1000: switch to use qemu_receive_packet() for loopback | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | This patch switches to use qemu_receive_packet() which can detect | ||
10 | reentrancy and return early. | ||
11 | |||
12 | This is intended to address CVE-2021-3416. | ||
13 | |||
14 | Cc: Prasad J Pandit <ppandit@redhat.com> | ||
15 | Cc: qemu-stable@nongnu.org | ||
16 | Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> | ||
17 | Signed-off-by: Jason Wang <jasowang@redhat.com> | ||
18 | |||
19 | Upstream-Status: Backport [1caff0340f49c93d535c6558a5138d20d475315c] | ||
20 | CVE: CVE-2021-3416 | ||
21 | |||
22 | Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> | ||
23 | --- | ||
24 | hw/net/e1000.c | 2 +- | ||
25 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
26 | |||
27 | diff --git a/hw/net/e1000.c b/hw/net/e1000.c | ||
28 | index d7d05ae30..cf22c4f07 100644 | ||
29 | --- a/hw/net/e1000.c | ||
30 | +++ b/hw/net/e1000.c | ||
31 | @@ -546,7 +546,7 @@ e1000_send_packet(E1000State *s, const uint8_t *buf, int size) | ||
32 | |||
33 | NetClientState *nc = qemu_get_queue(s->nic); | ||
34 | if (s->phy_reg[PHY_CTRL] & MII_CR_LOOPBACK) { | ||
35 | - nc->info->receive(nc, buf, size); | ||
36 | + qemu_receive_packet(nc, buf, size); | ||
37 | } else { | ||
38 | qemu_send_packet(nc, buf, size); | ||
39 | } | ||
40 | -- | ||
41 | 2.29.2 | ||
42 | |||