Skip to contentSkip to conversation

usb: gadget: function: printer: Replace strlcpy with strscpy

PATCH New Azeem Shaikh 1 participant 1 message Jun 15, 2023 USB

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 usb: gadget: function: printer: Replace strlcpy with strscpy

strlcpy() reads the entire source buffer first. This read may exceed the destination size limit. This is both inefficient and can lead to linear read overflows if a source string is not NUL-terminated [1]. In an effort to remove strlcpy() completely [2], replace strlcpy() here with strscpy().

Direct replacement is safe here since return value of -errno is used to check for truncation instead of PAGE_SIZE.

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
[2] https://github.com/KSPP/linux/issues/89

---
v2:
* Use "< 1" instead of "== -E2BIG".
* Update commit log to say PAGE_SIZE instead of sizeof(dest).

v1:
* https://lore.kernel.org/all/[email protected]/

 drivers/usb/gadget/function/f_printer.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/gadget/function/f_printer.c +2 -2
index 28db3e336e7d..b91425611969 100644
@@ -1211,8 +1211,8 @@ static ssize_t f_printer_opts_pnp_string_show(struct config_item *item,
 	if (!opts->pnp_string)
 		goto unlock;
 
-	result = strlcpy(page, opts->pnp_string, PAGE_SIZE);
-	if (result >= PAGE_SIZE) {
+	result = strscpy(page, opts->pnp_string, PAGE_SIZE);
+	if (result < 1) {
 		result = PAGE_SIZE;
 	} else if (page[result - 1] != '\n' && result + 1 < PAGE_SIZE) {
 		page[result++] = '\n';
Signature · 1 line
2.41.0.162.gfafddb0af9-goog