2018-02-17 04:57:01

by Kees Cook

[permalink] [raw]

Subject: [PATCH] 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: Kees Cook <[email protected]>
---
drivers/usb/misc/chaoskey.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/misc/chaoskey.c b/drivers/usb/misc/chaoskey.c
index 716cb515523e..cf5828ce927a 100644
--- a/drivers/usb/misc/chaoskey.c
+++ b/drivers/usb/misc/chaoskey.c
@@ -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;
--
2.7.4


--
Kees Cook
Pixel Security

2018-02-17 06:29:19

by Keith Packard

[permalink] [raw]

Subject: Re: [PATCH] USB: chaoskey: Use kasprintf() over strcpy()/strcat()

---

Kees Cook <[email protected]> writes:

> 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: Kees Cook <[email protected]>

Reviewed-by: Keith Packard <[email protected]>

--
-keith

---

Attachments:

signature.asc (847.00 B)