mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-10 11:40:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: usbip: fix potential segfault because of unchecked return value of strchr.

Browse Source 
This doesn't happen with the usbip virtual hci module, but another
module wanting to interface with this user space code could cause a
seg-fault by sending data without newlines.

Signed-off-by: Christopher Harvey <charvey@matrox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christopher Harvey
2012-03-23 10:55:25 -04:00
committed by Greg Kroah-Hartman
parent 310c6a762e
commit 2f5c638ced
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/staging/usbip/userspace/libsrc/vhci_driver.c
View File

@@ -59,7 +59,10 @@ static int parse_status(char *value)
/* skip a header line */
c = strchr(value, '\n') + 1;
c = strchr(value, '\n');
if (!c)
return -1;
c++;
while (*c != '\0') {
int port, status, speed, devid;
@@ -109,7 +112,10 @@ static int parse_status(char *value)
/* go to the next line */
c = strchr(c, '\n') + 1;
c = strchr(c, '\n');
if (!c)
break;
c++;
}
dbg("exit");
@@ -264,11 +270,17 @@ static int get_nports(void)
attr_status->method, attr_status->value);
/* skip a header line */
c = strchr(attr_status->value, '\n') + 1;
c = strchr(attr_status->value, '\n');
if (!c)
return 0;
c++;
while (*c != '\0') {
/* go to the next line */
c = strchr(c, '\n') + 1;
c = strchr(c, '\n');
if (!c)
return nports;
c++;
nports += 1;
}