hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Rickard Strandqvist 2014-07-26 16:43:20 +02:00 committed by Greg Kroah-Hartman
parent 4c86db6aac
commit 96955ed6f0
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/usbip/stub_main.c
View File

@ -94,7 +94,7 @@ static int add_match_busid(char *busid)
for (i = 0; i < MAX_BUSID; i++) for (i = 0; i < MAX_BUSID; i++)
if (!busid_table[i].name[0]) { 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) && if ((busid_table[i].status != STUB_BUSID_ALLOC) &&
(busid_table[i].status != STUB_BUSID_REMOV)) (busid_table[i].status != STUB_BUSID_REMOV))
busid_table[i].status = STUB_BUSID_ADDED; 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) if (count < 5)
return -EINVAL; return -EINVAL;
/* strnlen() does not include \0 */
len = strnlen(buf + 4, BUSID_SIZE);
/* busid needs to include \0 termination */ /* busid needs to include \0 termination */
if (!(len < BUSID_SIZE)) len = strlcpy(busid, buf + 4, BUSID_SIZE);
if (sizeof(busid) <= len)
return -EINVAL; return -EINVAL;
strncpy(busid, buf + 4, BUSID_SIZE);
if (!strncmp(buf, "add ", 4)) { if (!strncmp(buf, "add ", 4)) {
if (add_match_busid(busid) < 0) if (add_match_busid(busid) < 0)
return -ENOMEM; return -ENOMEM;