7f165dc009
- kvm-Revert-i386-Fix-pkg_id-offset-for-EPYC-cpu-models.patch [bz#1873417] - kvm-Revert-target-i386-Enable-new-apic-id-encoding-for-E.patch [bz#1873417] - kvm-Revert-hw-i386-Move-arch_id-decode-inside-x86_cpus_i.patch [bz#1873417] - kvm-Revert-i386-Introduce-use_epyc_apic_id_encoding-in-X.patch [bz#1873417] - kvm-Revert-hw-i386-Introduce-apicid-functions-inside-X86.patch [bz#1873417] - kvm-Revert-target-i386-Cleanup-and-use-the-EPYC-mode-top.patch [bz#1873417] - kvm-Revert-hw-386-Add-EPYC-mode-topology-decoding-functi.patch [bz#1873417] - kvm-nvram-Exit-QEMU-if-NVRAM-cannot-contain-all-prom-env.patch [bz#1867739] - kvm-usb-fix-setup_len-init-CVE-2020-14364.patch [bz#1869715] - kvm-Remove-explicit-glusterfs-api-dependency.patch [bz#1872853] - kvm-disable-virgl.patch [bz#1831271] - Resolves: bz#1831271 (Drop virgil acceleration support and remove virglrenderer dependency) - Resolves: bz#1867739 (-prom-env does not validate input) - Resolves: bz#1869715 (CVE-2020-14364 qemu-kvm: QEMU: usb: out-of-bounds r/w access issue while processing usb packets [rhel-av-8.3.0]) - Resolves: bz#1872853 (move the glusterfs dependency out of qemu-kvm-core to the glusterfs module) - Resolves: bz#1873417 (AMD/NUMA topology - revert 5.1 changes)
103 lines
3.7 KiB
Diff
103 lines
3.7 KiB
Diff
From e6d43ded51d658d77bb7f8a490f2bf93946d3215 Mon Sep 17 00:00:00 2001
|
|
From: Jon Maloy <jmaloy@redhat.com>
|
|
Date: Thu, 3 Sep 2020 14:27:19 -0400
|
|
Subject: [PATCH 09/11] usb: fix setup_len init (CVE-2020-14364)
|
|
|
|
RH-Author: Jon Maloy <jmaloy@redhat.com>
|
|
Message-id: <20200903142719.1415757-2-jmaloy@redhat.com>
|
|
Patchwork-id: 98265
|
|
O-Subject: [RHEL-AV-8.3.0 qemu-kvm PATCH 1/1] usb: fix setup_len init (CVE-2020-14364)
|
|
Bugzilla: 1869715
|
|
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
|
Store calculated setup_len in a local variable, verify it, and only
|
|
write it to the struct (USBDevice->setup_len) in case it passed the
|
|
sanity checks.
|
|
|
|
This prevents other code (do_token_{in,out} functions specifically)
|
|
from working with invalid USBDevice->setup_len values and overrunning
|
|
the USBDevice->setup_buf[] buffer.
|
|
|
|
Fixes: CVE-2020-14364
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
Tested-by: Gonglei <arei.gonglei@huawei.com>
|
|
Reviewed-by: Li Qiang <liq3ea@gmail.com>
|
|
Message-id: 20200825053636.29648-1-kraxel@redhat.com
|
|
(cherry picked from commit b946434f2659a182afc17e155be6791ebfb302eb)
|
|
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
hw/usb/core.c | 16 ++++++++++------
|
|
1 file changed, 10 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/hw/usb/core.c b/hw/usb/core.c
|
|
index 5abd128b6b..5234dcc73f 100644
|
|
--- a/hw/usb/core.c
|
|
+++ b/hw/usb/core.c
|
|
@@ -129,6 +129,7 @@ void usb_wakeup(USBEndpoint *ep, unsigned int stream)
|
|
static void do_token_setup(USBDevice *s, USBPacket *p)
|
|
{
|
|
int request, value, index;
|
|
+ unsigned int setup_len;
|
|
|
|
if (p->iov.size != 8) {
|
|
p->status = USB_RET_STALL;
|
|
@@ -138,14 +139,15 @@ static void do_token_setup(USBDevice *s, USBPacket *p)
|
|
usb_packet_copy(p, s->setup_buf, p->iov.size);
|
|
s->setup_index = 0;
|
|
p->actual_length = 0;
|
|
- s->setup_len = (s->setup_buf[7] << 8) | s->setup_buf[6];
|
|
- if (s->setup_len > sizeof(s->data_buf)) {
|
|
+ setup_len = (s->setup_buf[7] << 8) | s->setup_buf[6];
|
|
+ if (setup_len > sizeof(s->data_buf)) {
|
|
fprintf(stderr,
|
|
"usb_generic_handle_packet: ctrl buffer too small (%d > %zu)\n",
|
|
- s->setup_len, sizeof(s->data_buf));
|
|
+ setup_len, sizeof(s->data_buf));
|
|
p->status = USB_RET_STALL;
|
|
return;
|
|
}
|
|
+ s->setup_len = setup_len;
|
|
|
|
request = (s->setup_buf[0] << 8) | s->setup_buf[1];
|
|
value = (s->setup_buf[3] << 8) | s->setup_buf[2];
|
|
@@ -259,26 +261,28 @@ static void do_token_out(USBDevice *s, USBPacket *p)
|
|
static void do_parameter(USBDevice *s, USBPacket *p)
|
|
{
|
|
int i, request, value, index;
|
|
+ unsigned int setup_len;
|
|
|
|
for (i = 0; i < 8; i++) {
|
|
s->setup_buf[i] = p->parameter >> (i*8);
|
|
}
|
|
|
|
s->setup_state = SETUP_STATE_PARAM;
|
|
- s->setup_len = (s->setup_buf[7] << 8) | s->setup_buf[6];
|
|
s->setup_index = 0;
|
|
|
|
request = (s->setup_buf[0] << 8) | s->setup_buf[1];
|
|
value = (s->setup_buf[3] << 8) | s->setup_buf[2];
|
|
index = (s->setup_buf[5] << 8) | s->setup_buf[4];
|
|
|
|
- if (s->setup_len > sizeof(s->data_buf)) {
|
|
+ setup_len = (s->setup_buf[7] << 8) | s->setup_buf[6];
|
|
+ if (setup_len > sizeof(s->data_buf)) {
|
|
fprintf(stderr,
|
|
"usb_generic_handle_packet: ctrl buffer too small (%d > %zu)\n",
|
|
- s->setup_len, sizeof(s->data_buf));
|
|
+ setup_len, sizeof(s->data_buf));
|
|
p->status = USB_RET_STALL;
|
|
return;
|
|
}
|
|
+ s->setup_len = setup_len;
|
|
|
|
if (p->pid == USB_TOKEN_OUT) {
|
|
usb_packet_copy(p, s->data_buf, s->setup_len);
|
|
--
|
|
2.27.0
|
|
|