xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USB: replace hardcode maximum usb string length by definition

Browse Source 
Replace hardcoded maximum USB string length (126 bytes) by definition
"USB_MAX_STRING_LEN".

Signed-off-by: Macpaul Lin <macpaul.lin@mediatek.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Link: https://lore.kernel.org/r/1592471618-29428-1-git-send-email-macpaul.lin@mediatek.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Macpaul Lin
2020-06-18 17:13:38 +08:00
committed by Greg Kroah-Hartman
parent cda37dbbf1
commit 81c7462883
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/gadget/composite.c
View File

@@ -1085,7 +1085,7 @@ static void collect_langs(struct usb_gadget_strings **sp, __le16 *buf)
while (*sp) { while (*sp) {
s = *sp; s = *sp;
language = cpu_to_le16(s->language); language = cpu_to_le16(s->language);
for (tmp = buf; *tmp && tmp < &buf[126]; tmp++) { for (tmp = buf; *tmp && tmp < &buf[USB_MAX_STRING_LEN]; tmp++) {
if (*tmp == language) if (*tmp == language)
goto repeat; goto repeat;
} }
@@ -1160,7 +1160,7 @@ static int get_string(struct usb_composite_dev *cdev,
collect_langs(sp, s->wData); collect_langs(sp, s->wData);
} }
for (len = 0; len <= 126 && s->wData[len]; len++) for (len = 0; len <= USB_MAX_STRING_LEN && s->wData[len]; len++)
continue; continue;
if (!len) if (!len)
return -EINVAL; return -EINVAL;

2
drivers/usb/gadget/configfs.c
View File

@@ -103,7 +103,7 @@ static int usb_string_copy(const char *s, char **s_copy)
char *str; char *str;
char *copy = *s_copy; char *copy = *s_copy;
ret = strlen(s); ret = strlen(s);
if (ret > 126) if (ret > USB_MAX_STRING_LEN)
return -EOVERFLOW; return -EOVERFLOW;
str = kstrdup(s, GFP_KERNEL); str = kstrdup(s, GFP_KERNEL);

4
drivers/usb/gadget/usbstring.c
View File

@@ -55,9 +55,9 @@ usb_gadget_get_string (const struct usb_gadget_strings *table, int id, u8 *buf)
return -EINVAL; return -EINVAL;
/* string descriptors have length, tag, then UTF16-LE text */ /* string descriptors have length, tag, then UTF16-LE text */
len = min ((size_t) 126, strlen (s->s)); len = min((size_t)USB_MAX_STRING_LEN, strlen(s->s));
len = utf8s_to_utf16s(s->s, len, UTF16_LITTLE_ENDIAN, len = utf8s_to_utf16s(s->s, len, UTF16_LITTLE_ENDIAN,
(wchar_t *) &buf[2], 126); (wchar_t *) &buf[2], USB_MAX_STRING_LEN);
if (len < 0) if (len < 0)
return -EINVAL; return -EINVAL;
buf [0] = (len + 1) * 2; buf [0] = (len + 1) * 2;

3
include/uapi/linux/usb/ch9.h
View File

@@ -368,6 +368,9 @@ struct usb_config_descriptor {
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
/* USB String descriptors can contain at most 126 characters. */
#define USB_MAX_STRING_LEN 126
/* USB_DT_STRING: String descriptor */ /* USB_DT_STRING: String descriptor */
struct usb_string_descriptor { struct usb_string_descriptor {
__u8 bLength; __u8 bLength;