Commit b382a5c3 authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

USB: chaoskey: Use kasprintf() over strcpy()/strcat() 



Instead of kmalloc() with manually calculated values followed by
multiple strcpy()/strcat() calls, just fold it all into a single
kasprintf() call.

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 22072e83

drivers/usb/misc/chaoskey.c

+2 −6
Original line number Diff line number Diff line
@@ -168,14 +168,10 @@ static int chaoskey_probe(struct usb_interface *interface, 
	 */



	if (udev->product && udev->serial) {

		dev->name = kmalloc(strlen(udev->product) + 1 +

				    strlen(udev->serial) + 1, GFP_KERNEL);

		dev->name = kasprintf(GFP_KERNEL, "%s-%s", udev->product,

				      udev->serial);

		if (dev->name == NULL)

			goto out;



		strcpy(dev->name, udev->product);

		strcat(dev->name, "-");

		strcat(dev->name, udev->serial);

	}



	dev->interface = interface;

CRA Git | Maintained and supported by SUSTech CRA and CCSE