Commit 96955ed6 authored by Rickard Strandqvist's avatar Rickard Strandqvist Committed by Greg Kroah-Hartman
Browse files

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



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

Signed-off-by: default avatarRickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4c86db6a

drivers/staging/usbip/stub_main.c

+3 −7
Original line number Diff line number Diff line
@@ -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;