michaelh/zephyr
1
0
Fork 0
Code Releases Activity

usb: device_next: fix the null pointer dereference on FS devices

Browse source 
With the commit fe3c001eeb ("usb: device_next: disable high-speed USB
device descriptor if not used") there is no high-speed device descriptor
by default.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
This commit is contained in:
Johann Fischer 2025-06-10 11:41:11 +02:00 • committed by Benjamin Cabé
commit 569f4d6d18
2 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
subsys/usb/device_next/usbd_ch9.c
View file

@ -683,12 +683,6 @@ static int sreq_get_dev_qualifier(struct usbd_context *const uds_ctx,
struct usb_device_qualifier_descriptor q_desc = {
.bLength = sizeof(struct usb_device_qualifier_descriptor),
.bDescriptorType = USB_DESC_DEVICE_QUALIFIER,
.bcdUSB = d_desc->bcdUSB,
.bDeviceClass = d_desc->bDeviceClass,
.bDeviceSubClass = d_desc->bDeviceSubClass,
.bDeviceProtocol = d_desc->bDeviceProtocol,
.bMaxPacketSize0 = d_desc->bMaxPacketSize0,
.bNumConfigurations = d_desc->bNumConfigurations,
.bReserved = 0U,
};
size_t len;
@ -703,6 +697,17 @@ static int sreq_get_dev_qualifier(struct usbd_context *const uds_ctx,
return 0;
}
if (d_desc == NULL) {
return -EINVAL;
}
q_desc.bcdUSB = d_desc->bcdUSB;
q_desc.bDeviceClass = d_desc->bDeviceClass;
q_desc.bDeviceSubClass = d_desc->bDeviceSubClass;
q_desc.bDeviceProtocol = d_desc->bDeviceProtocol;
q_desc.bMaxPacketSize0 = d_desc->bMaxPacketSize0;
q_desc.bNumConfigurations = d_desc->bNumConfigurations;
LOG_DBG("Get Device Qualifier");
len = MIN(setup->wLength, net_buf_tailroom(buf));
net_buf_add_mem(buf, &q_desc, MIN(len, q_desc.bLength));

10
subsys/usb/device_next/usbd_device.c
View file

@ -66,6 +66,11 @@ int usbd_device_set_bcd_usb(struct usbd_context *const uds_ctx,
}
desc = get_device_descriptor(uds_ctx, speed);
if (desc == NULL) {
ret = -EINVAL;
goto set_bcd_exit;
}
desc->bcdUSB = sys_cpu_to_le16(bcd);
set_bcd_exit:
@ -167,6 +172,11 @@ int usbd_device_set_code_triple(struct usbd_context *const uds_ctx,
}
desc = get_device_descriptor(uds_ctx, speed);
if (desc == NULL) {
ret = -EINVAL;
goto set_code_triple_exit;
}
desc->bDeviceClass = base_class;
desc->bDeviceSubClass = subclass;
desc->bDeviceProtocol = protocol;