Commit 3b5eac68 authored by Justin Stitt's avatar Justin Stitt Committed by Greg Kroah-Hartman
Browse files

usb: gadget: mv_u3d: replace deprecated strncpy with strscpy 

strncpy() is deprecated for use on NUL-terminated destination strings
[1] and as such we should prefer more robust and less ambiguous string
interfaces.

Let's opt for the new 2-argument version of strscpy() which guarantees
NUL-termination on the destination buffer and simplifies snytax. The
NUL-padding behavior that strncpy() provides is not required as u3d->eps
is already zero-allocated:
|	u3d->eps = kzalloc(size, GFP_KERNEL);

Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1]
Link: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html [2]
Link: https://github.com/KSPP/linux/issues/90


Cc: linux-hardening@vger.kernel.org
Signed-off-by: default avatarJustin Stitt <justinstitt@google.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20240318-strncpy-drivers-usb-gadget-udc-mv_u3d_core-c-v1-1-64f8dcdb7c07@google.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c58ab924

drivers/usb/gadget/udc/mv_u3d_core.c

+2 −2
Original line number Diff line number Diff line
@@ -1307,7 +1307,7 @@ static int mv_u3d_eps_init(struct mv_u3d *u3d) 
	/* initialize ep0, ep0 in/out use eps[1] */

	ep = &u3d->eps[1];

	ep->u3d = u3d;

	strncpy(ep->name, "ep0", sizeof(ep->name));

	strscpy(ep->name, "ep0");

	ep->ep.name = ep->name;

	ep->ep.ops = &mv_u3d_ep_ops;

	ep->wedge = 0;
@@ -1337,7 +1337,7 @@ static int mv_u3d_eps_init(struct mv_u3d *u3d) 
			ep->ep.caps.dir_out = true;

		}

		ep->u3d = u3d;

		strncpy(ep->name, name, sizeof(ep->name));

		strscpy(ep->name, name);

		ep->ep.name = ep->name;



		ep->ep.caps.type_iso = true;