4c9cabc593
- In an effort to "Close the Leap Gap", remove use of is_opensuse from the spec file, so that the same packages built for SLE can be reused for Leap. Some sub-packages will not be included for SLE which are included for Leap. They wil be provided in Package Hub for SLE users as unsupported packages. - Add infrastructure to do package splits when split-off package isn't required and doesn't (otherwise) include any previously installed files. This version of qemu has split out non-essential functionality into loadable modules, as noted in Aug 20, 2020 log entry, which describes the emergency Split-Provides. That approach will be superseded by this planned approach, and those dummy doc files will be removed in time Here is the new mapping: subpackage continuity file provided (files are dummies) ========== ============================================ qemu-chardev-baum /usr/share/qemu/forsplits/00 qemu-hw-display-qxl /usr/share/qemu/forsplits/01 qemu-hw-usb-redirect /usr/share/qemu/forsplits/02 qemu-hw-usb-smartcard /usr/share/qemu/forsplits/03 - Fix path of qemu-pr-helper. It was a mistake to move it from %_bindir to _libexecdir. In more recent qemu code it's been moved back, so undo this mistake by providing it at the same location as it has been all along OBS-URL: https://build.opensuse.org/request/show/833587 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=570
87 lines
3.1 KiB
Diff
87 lines
3.1 KiB
Diff
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Tue, 25 Aug 2020 07:36:36 +0200
|
|
Subject: usb: fix setup_len init (CVE-2020-14364)
|
|
|
|
Git-commit: b946434f2659a182afc17e155be6791ebfb302eb
|
|
References: bsc#1175441, CVE-2020-14364
|
|
|
|
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>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.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 5abd128b6bc5f5440e18b143fe41..5234dcc73fea6012f7143f307640 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);
|