diff options
author | Sakib Sajal <sakib.sajal@windriver.com> | 2021-08-16 20:09:13 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-07 15:10:40 +0100 |
commit | a8857b495515d7a6b498012cc1d506256e03530d (patch) | |
tree | 3c6ead95dc144b1afcbbc9d6a843ef7255ce62d4 /meta/recipes-devtools/qemu | |
parent | c663e97a2d986f3b3193d7b4a012127740be6177 (diff) | |
download | poky-a8857b495515d7a6b498012cc1d506256e03530d.tar.gz |
qemu: fix CVE-2021-3682
(From OE-Core rev: 14783d10fb43d10a91d5e61ad9811ad469a0fb46)
Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e16cd155c5ef7cfe8b4d3a94485cb7b13fd95036)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.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-2021-3682.patch | 41 |
2 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index c3eecea9d4..463339e42b 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -69,6 +69,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ | |||
69 | file://CVE-2021-3582.patch \ | 69 | file://CVE-2021-3582.patch \ |
70 | file://CVE-2021-3607.patch \ | 70 | file://CVE-2021-3607.patch \ |
71 | file://CVE-2021-3608.patch \ | 71 | file://CVE-2021-3608.patch \ |
72 | file://CVE-2021-3682.patch \ | ||
72 | " | 73 | " |
73 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" | 74 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" |
74 | 75 | ||
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3682.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3682.patch new file mode 100644 index 0000000000..50a49233d3 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-3682.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 5e796671e6b8d5de4b0b423dce1b3eba144a92c9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Gerd Hoffmann <kraxel@redhat.com> | ||
3 | Date: Thu, 22 Jul 2021 09:27:56 +0200 | ||
4 | Subject: [PATCH] usbredir: fix free call | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | data might point into the middle of a larger buffer, there is a separate | ||
10 | free_on_destroy pointer passed into bufp_alloc() to handle that. It is | ||
11 | only used in the normal workflow though, not when dropping packets due | ||
12 | to the queue being full. Fix that. | ||
13 | |||
14 | Resolves: https://gitlab.com/qemu-project/qemu/-/issues/491 | ||
15 | Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> | ||
16 | Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> | ||
17 | Message-Id: <20210722072756.647673-1-kraxel@redhat.com> | ||
18 | |||
19 | CVE: CVE-2021-3682 | ||
20 | Upstream-Status: Backport [5e796671e6b8d5de4b0b423dce1b3eba144a92c9] | ||
21 | Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> | ||
22 | --- | ||
23 | hw/usb/redirect.c | 2 +- | ||
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
25 | |||
26 | diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c | ||
27 | index 4ec9326e05..1ec909a63a 100644 | ||
28 | --- a/hw/usb/redirect.c | ||
29 | +++ b/hw/usb/redirect.c | ||
30 | @@ -476,7 +476,7 @@ static int bufp_alloc(USBRedirDevice *dev, uint8_t *data, uint16_t len, | ||
31 | if (dev->endpoint[EP2I(ep)].bufpq_dropping_packets) { | ||
32 | if (dev->endpoint[EP2I(ep)].bufpq_size > | ||
33 | dev->endpoint[EP2I(ep)].bufpq_target_size) { | ||
34 | - free(data); | ||
35 | + free(free_on_destroy); | ||
36 | return -1; | ||
37 | } | ||
38 | dev->endpoint[EP2I(ep)].bufpq_dropping_packets = 0; | ||
39 | -- | ||
40 | 2.25.1 | ||
41 | |||