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_7.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_7.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/CVE-2021-3416_7.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_7.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_7.patch deleted file mode 100644 index 4e1115de02..0000000000 --- a/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_7.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From 64b38675c728354e4015e4bec3d975cd4cb8a981 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Bulekov <alxndr@bu.edu> | ||
3 | Date: Fri, 26 Feb 2021 13:47:53 -0500 | ||
4 | Subject: [PATCH 07/10] rtl8139: switch to use qemu_receive_packet() for | ||
5 | loopback | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | This patch switches to use qemu_receive_packet() which can detect | ||
11 | reentrancy and return early. | ||
12 | |||
13 | This is intended to address CVE-2021-3416. | ||
14 | |||
15 | Cc: Prasad J Pandit <ppandit@redhat.com> | ||
16 | Cc: qemu-stable@nongnu.org | ||
17 | Buglink: https://bugs.launchpad.net/qemu/+bug/1910826 | ||
18 | Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com | ||
19 | Signed-off-by: Alexander Bulekov <alxndr@bu.edu> | ||
20 | Signed-off-by: Jason Wang <jasowang@redhat.com> | ||
21 | |||
22 | Upstream-Status: Backport [5311fb805a4403bba024e83886fa0e7572265de4] | ||
23 | CVE: CVE-2021-3416 | ||
24 | |||
25 | Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> | ||
26 | --- | ||
27 | hw/net/rtl8139.c | 2 +- | ||
28 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
29 | |||
30 | diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c | ||
31 | index ba5ace1ab..d2dd03e6a 100644 | ||
32 | --- a/hw/net/rtl8139.c | ||
33 | +++ b/hw/net/rtl8139.c | ||
34 | @@ -1795,7 +1795,7 @@ static void rtl8139_transfer_frame(RTL8139State *s, uint8_t *buf, int size, | ||
35 | } | ||
36 | |||
37 | DPRINTF("+++ transmit loopback mode\n"); | ||
38 | - rtl8139_do_receive(qemu_get_queue(s->nic), buf, size, do_interrupt); | ||
39 | + qemu_receive_packet(qemu_get_queue(s->nic), buf, size); | ||
40 | |||
41 | if (iov) { | ||
42 | g_free(buf2); | ||
43 | -- | ||
44 | 2.29.2 | ||
45 | |||