adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

usb: device: allow uneven SN to be obtained from HWINFO

Browse source 
If the length of the string literal reserved for the serial number
descriptor is odd, the string is not used because its length is always
even and therefore one character longer. Fix this by using the shortest
length for the copy.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
This commit is contained in:
Johann Fischer 2024-05-23 13:37:17 +02:00 committed by Johan Hedberg
parent 486d109e7e
commit ed8c99977f
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
subsys/usb/device/usb_descriptor.c
View file

@ -347,12 +347,11 @@ static void usb_fix_ascii_sn_string_descriptor(struct usb_sn_descriptor *sn)
default_sn_len = strlen(CONFIG_USB_DEVICE_SN); default_sn_len = strlen(CONFIG_USB_DEVICE_SN);
if (runtime_sn_len != default_sn_len) { if (runtime_sn_len != default_sn_len) {
LOG_ERR("the new SN descriptor doesn't have the same " LOG_WRN("the new SN descriptor doesn't have the same "
"length as CONFIG_USB_DEVICE_SN"); "length as CONFIG_USB_DEVICE_SN");
return;
} }
memcpy(sn->bString, runtime_sn, runtime_sn_len); memcpy(sn->bString, runtime_sn, MIN(runtime_sn_len, default_sn_len));
} }
static void usb_desc_update_mps0(struct usb_device_descriptor *const desc) static void usb_desc_update_mps0(struct usb_device_descriptor *const desc)