Skip to content
Snippets Groups Projects
Commit 13b250b1 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

uas: add stream number sanity checks.


The device uses the guest-supplied stream number unchecked, which can
lead to guest-triggered out-of-band access to the UASDevice->data3 and
UASDevice->status3 fields.  Add the missing checks.

Fixes: CVE-2021-3713
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reported-by: default avatarChen Zhe <chenzhe@huawei.com>
Reported-by: default avatarTan Jingguo <tanjingguo@huawei.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210818120505.1258262-2-kraxel@redhat.com>
parent ad22d058
No related branches found
No related tags found
No related merge requests found
...@@ -840,6 +840,9 @@ static void usb_uas_handle_data(USBDevice *dev, USBPacket *p) ...@@ -840,6 +840,9 @@ static void usb_uas_handle_data(USBDevice *dev, USBPacket *p)
} }
break; break;
case UAS_PIPE_ID_STATUS: case UAS_PIPE_ID_STATUS:
if (p->stream > UAS_MAX_STREAMS) {
goto err_stream;
}
if (p->stream) { if (p->stream) {
QTAILQ_FOREACH(st, &uas->results, next) { QTAILQ_FOREACH(st, &uas->results, next) {
if (st->stream == p->stream) { if (st->stream == p->stream) {
...@@ -867,6 +870,9 @@ static void usb_uas_handle_data(USBDevice *dev, USBPacket *p) ...@@ -867,6 +870,9 @@ static void usb_uas_handle_data(USBDevice *dev, USBPacket *p)
break; break;
case UAS_PIPE_ID_DATA_IN: case UAS_PIPE_ID_DATA_IN:
case UAS_PIPE_ID_DATA_OUT: case UAS_PIPE_ID_DATA_OUT:
if (p->stream > UAS_MAX_STREAMS) {
goto err_stream;
}
if (p->stream) { if (p->stream) {
req = usb_uas_find_request(uas, p->stream); req = usb_uas_find_request(uas, p->stream);
} else { } else {
...@@ -902,6 +908,11 @@ static void usb_uas_handle_data(USBDevice *dev, USBPacket *p) ...@@ -902,6 +908,11 @@ static void usb_uas_handle_data(USBDevice *dev, USBPacket *p)
p->status = USB_RET_STALL; p->status = USB_RET_STALL;
break; break;
} }
err_stream:
error_report("%s: invalid stream %d", __func__, p->stream);
p->status = USB_RET_STALL;
return;
} }
static void usb_uas_unrealize(USBDevice *dev) static void usb_uas_unrealize(USBDevice *dev)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment