[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/18] usb: fix setup_len init (CVE-2020-14364)
From: |
Gerd Hoffmann |
Subject: |
[PULL 18/18] usb: fix setup_len init (CVE-2020-14364) |
Date: |
Wed, 26 Aug 2020 16:52:39 +0200 |
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
---
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 5abd128b6bc5..5234dcc73fea 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
- [PULL 04/18] ehci: drop pointless warn_report for guest bugs., (continued)
- [PULL 04/18] ehci: drop pointless warn_report for guest bugs., Gerd Hoffmann, 2020/08/26
- [PULL 03/18] hw: ehci: check return value of 'usb_packet_map', Gerd Hoffmann, 2020/08/26
- [PULL 05/18] hw/usb: Regroup USB HID protocol values, Gerd Hoffmann, 2020/08/26
- [PULL 12/18] docs/system: Add U2F key to the USB devices examples, Gerd Hoffmann, 2020/08/26
- [PULL 01/18] hw: xhci: check return value of 'usb_packet_map', Gerd Hoffmann, 2020/08/26
- [PULL 08/18] hw/usb: Add U2F key base class implementation, Gerd Hoffmann, 2020/08/26
- [PULL 13/18] docs/qdev-device-use.txt: Add USB U2F key to the QDEV devices examples, Gerd Hoffmann, 2020/08/26
- [PULL 06/18] docs: Add USB U2F key device documentation, Gerd Hoffmann, 2020/08/26
- [PULL 09/18] hw/usb: Add U2F key passthru mode, Gerd Hoffmann, 2020/08/26
- [PULL 10/18] hw/usb: Add U2F key emulated mode, Gerd Hoffmann, 2020/08/26
- [PULL 18/18] usb: fix setup_len init (CVE-2020-14364),
Gerd Hoffmann <=
- [PULL 17/18] usb-host: workaround libusb bug, Gerd Hoffmann, 2020/08/26
- [PULL 14/18] scripts: Add u2f-setup-gen script, Gerd Hoffmann, 2020/08/26
- [PULL 11/18] meson: Add U2F key to meson, Gerd Hoffmann, 2020/08/26
- [PULL 07/18] hw/usb: Add U2F key base class, Gerd Hoffmann, 2020/08/26
- [PULL 15/18] hw/usb: Add U2F device check to passthru mode, Gerd Hoffmann, 2020/08/26
- [PULL 16/18] hw/usb: Add U2F device autoscan to passthru mode, Gerd Hoffmann, 2020/08/26
- Re: [PULL 00/18] Usb 20200826 patches, Peter Maydell, 2020/08/26