mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH v2] usb: gadget: function: printer: Replace strlcpy with strscpy
@ 2023-06-15 18:03 Azeem Shaikh
  0 siblings, 0 replies; only message in thread
From: Azeem Shaikh @ 2023-06-15 18:03 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Kees Cook
  Cc: linux-hardening, Azeem Shaikh, linux-usb, linux-kernel,
	Albert Briscoe, Andrzej Pietrasiewicz, Benjamin Tissoires

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

Signed-off-by: Azeem Shaikh <azeemshaikh38@gmail.com>
---
v2:
 * Use "< 1" instead of "== -E2BIG".
 * Update commit log to say PAGE_SIZE instead of sizeof(dest).

v1:
 * https://lore.kernel.org/all/20230613004341.3540325-1-azeemshaikh38@gmail.com/

 drivers/usb/gadget/function/f_printer.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/gadget/function/f_printer.c b/drivers/usb/gadget/function/f_printer.c
index 28db3e336e7d..b91425611969 100644
--- a/drivers/usb/gadget/function/f_printer.c
+++ b/drivers/usb/gadget/function/f_printer.c
@@ -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';
-- 
2.41.0.162.gfafddb0af9-goog



^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-06-15 18:03 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-15 18:03 [PATCH v2] usb: gadget: function: printer: Replace strlcpy with strscpy Azeem Shaikh

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®