staging: usbip: stub_main.c: Cleaning up missing null-terminate in conjunction with...

Replacing strncpy with strlcpy to avoid strings that lacks null terminate.

Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/usbip/stub_main.c b/drivers/staging/usbip/stub_main.c
index 9c5832abbdf1cde4a9e3dd71455d9a5c6a5c65a3..44ab43fc4fcc71c8f7732e5c74120ae278b0b89f 100644 (file)
--- a/drivers/staging/usbip/stub_main.c
+++ b/drivers/staging/usbip/stub_main.c
@@ -94,7 +94,7 @@ static int add_match_busid(char *busid)
 
        for (i = 0; i < MAX_BUSID; i++)
                if (!busid_table[i].name[0]) {
-                       strncpy(busid_table[i].name, busid, BUSID_SIZE);
+                       strlcpy(busid_table[i].name, busid, BUSID_SIZE);
                        if ((busid_table[i].status != STUB_BUSID_ALLOC) &&
                            (busid_table[i].status != STUB_BUSID_REMOV))
                                busid_table[i].status = STUB_BUSID_ADDED;
@@ -158,15 +158,11 @@ static ssize_t store_match_busid(struct device_driver *dev, const char *buf,
        if (count < 5)
                return -EINVAL;
 
-       /* strnlen() does not include \0 */
-       len = strnlen(buf + 4, BUSID_SIZE);
-
        /* busid needs to include \0 termination */
-       if (!(len < BUSID_SIZE))
+       len = strlcpy(busid, buf + 4, BUSID_SIZE);
+       if (sizeof(busid) <= len)
                return -EINVAL;
 
-       strncpy(busid, buf + 4, BUSID_SIZE);
-
        if (!strncmp(buf, "add ", 4)) {
                if (add_match_busid(busid) < 0)
                        return -ENOMEM;