3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb_cdc: Perform basic request validation 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2018-09-30 15:37:55 -04:00
parent 93e4897044
commit c0311bee33
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/generic/usb_cdc.c
View File

@ -355,7 +355,8 @@ usb_do_xfer(void *data, uint_fast8_t size, uint_fast8_t flags)
static void static void
usb_req_get_descriptor(struct usb_ctrlrequest *req) usb_req_get_descriptor(struct usb_ctrlrequest *req)
{ {
// XXX - validate req if (req->bRequestType != USB_DIR_IN)
goto fail;
uint_fast8_t i; uint_fast8_t i;
for (i=0; i<ARRAY_SIZE(cdc_descriptors); i++) { for (i=0; i<ARRAY_SIZE(cdc_descriptors); i++) {
const struct descriptor_s *d = &cdc_descriptors[i]; const struct descriptor_s *d = &cdc_descriptors[i];
@ -371,18 +372,27 @@ usb_req_get_descriptor(struct usb_ctrlrequest *req)
return; return;
} }
} }
fail:
usb_do_stall(); usb_do_stall();
} }
static void static void
usb_req_set_address(struct usb_ctrlrequest *req) usb_req_set_address(struct usb_ctrlrequest *req)
{ {
if (req->bRequestType || req->wIndex || req->wLength) {
usb_do_stall();
return;
}
usb_set_address(req->wValue); usb_set_address(req->wValue);
} }
static void static void
usb_req_set_configuration(struct usb_ctrlrequest *req) usb_req_set_configuration(struct usb_ctrlrequest *req)
{ {
if (req->bRequestType || req->wValue != 1 || req->wIndex || req->wLength) {
usb_do_stall();
return;
}
usb_set_configure(); usb_set_configure();
usb_notify_bulk_in(); usb_notify_bulk_in();
usb_do_xfer(NULL, 0, UX_SEND); usb_do_xfer(NULL, 0, UX_SEND);
@ -393,18 +403,32 @@ static struct usb_cdc_line_coding line_coding;
static void static void
usb_req_set_line_coding(struct usb_ctrlrequest *req) usb_req_set_line_coding(struct usb_ctrlrequest *req)
{ {
if (req->bRequestType != 0x21 || req->wValue || req->wIndex
|| req->wLength != sizeof(line_coding)) {
usb_do_stall();
return;
}
usb_do_xfer(&line_coding, sizeof(line_coding), UX_READ); usb_do_xfer(&line_coding, sizeof(line_coding), UX_READ);
} }
static void static void
usb_req_get_line_coding(struct usb_ctrlrequest *req) usb_req_get_line_coding(struct usb_ctrlrequest *req)
{ {
if (req->bRequestType != 0xa1 || req->wValue || req->wIndex
|| req->wLength < sizeof(line_coding)) {
usb_do_stall();
return;
}
usb_do_xfer(&line_coding, sizeof(line_coding), UX_SEND); usb_do_xfer(&line_coding, sizeof(line_coding), UX_SEND);
} }
static void static void
usb_req_set_line(struct usb_ctrlrequest *req) usb_req_set_line(struct usb_ctrlrequest *req)
{ {
if (req->bRequestType != 0x21 || req->wIndex || req->wLength) {
usb_do_stall();
return;
}
usb_do_xfer(NULL, 0, UX_SEND); usb_do_xfer(NULL, 0, UX_SEND);
} }