superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb: gadget: configfs: Ignore trailing LF for user strings to cdev 

Since commit c033563220
("usb: gadget: configfs: Attach arbitrary strings to cdev")
a user can provide extra string descriptors to a USB gadget via configfs.

For "manufacturer", "product", "serialnumber", setting the string via
configfs ignores a trailing LF.

For the arbitrary strings the LF was not ignored.

This patch ignores a trailing LF to make this consistent with the existing
behavior for "manufacturer", ...  string descriptors.

Fixes: c033563220 ("usb: gadget: configfs: Attach arbitrary strings to cdev")
Cc: stable <stable@kernel.org>
Signed-off-by: Ingo Rohloff <ingo.rohloff@lauterbach.com>
Link: https://lore.kernel.org/r/20241212154114.29295-1-ingo.rohloff@lauterbach.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
pull/1126/head
Ingo Rohloff 2024-12-12 16:41:14 +01:00 committed by Greg Kroah-Hartman
parent 7a3d76a0b6
commit 9466545720
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -827,11 +827,15 @@ static ssize_t gadget_string_s_store(struct config_item *item, const char *page,
{
struct gadget_string *string = to_gadget_string(item);
int size = min(sizeof(string->string), len + 1);
ssize_t cpy_len;
if (len > USB_MAX_STRING_LEN)
return -EINVAL;
return strscpy(string->string, page, size);
cpy_len = strscpy(string->string, page, size);
if (cpy_len > 0 && string->string[cpy_len - 1] == '\n')
string->string[cpy_len - 1] = 0;
return len;
}
CONFIGFS_ATTR(gadget_string_, s);