Skip to content

usbdevice: validate string descriptor index #11545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Old-Ding wants to merge 1 commit into
base: master
Choose a base branch
from
+39 −15
Open

usbdevice: validate string descriptor index #11545

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 39 additions & 15 deletions components/legacy/usb/usbdevice/core/usbdevice_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ static rt_err_t _get_string_descriptor(struct udevice* device, ureq_t setup)
struct ustring_descriptor str_desc;
rt_uint8_t index, i;
rt_uint32_t len;
const char *string;

/* parameter check */
RT_ASSERT(device != RT_NULL);
Expand All @@ -113,32 +114,55 @@ static rt_err_t _get_string_descriptor(struct udevice* device, ureq_t setup)
index = USB_STRING_OS_INDEX;
}

if(index > USB_STRING_MAX)
{
rt_kprintf("unknown string index\n");
rt_usbd_ep0_set_stall(device);
return -RT_ERROR;
}
else if(index == USB_STRING_LANGID_INDEX)
if(index == USB_STRING_LANGID_INDEX)
{
str_desc.bLength = 4;
str_desc.String[0] = 0x09;
str_desc.String[1] = 0x04;
}
else
{
if(index < 5)
len = rt_strlen(device->str[index]);
else
len = rt_strlen(device->str_intf[index]);
string = RT_NULL;

if(index < USB_STRING_INTERFACE_INDEX)
{
if(device->str != RT_NULL)
{
string = device->str[index];
}
}
else if(index == USB_STRING_OS_INDEX)
{
/* The Microsoft OS string is valid only when an OS compatible ID
* descriptor has been registered. */
if((device->os_comp_id_desc != RT_NULL) &&
(rt_list_len(&device->os_comp_id_desc->func_desc) != 0))
{
string = USB_STRING_OS;
}
else if(index < MAX_INTF_STR)
{
string = device->str_intf[index];
}
}
else if(index < MAX_INTF_STR)
{
string = device->str_intf[index];
}

if(string == RT_NULL)
{
rt_kprintf("unknown string index\n");
rt_usbd_ep0_set_stall(device);
return -RT_ERROR;
}

len = rt_strlen(string);
str_desc.bLength = len*2 + 2;

for(i=0; i<len; i++)
{
if(index < 5)
str_desc.String[i*2] = device->str[index][i];
else
str_desc.String[i*2] = device->str_intf[index][i];
str_desc.String[i*2] = string[i];
str_desc.String[i*2 + 1] = 0;
}
}
Expand Down
Loading