Commit e325808c authored by Colin Ian King's avatar Colin Ian King Committed by Greg Kroah-Hartman

usbip: tools: fix atoi() on non-null terminated string

Currently the call to atoi is being passed a single char string
that is not null terminated, so there is a potential read overrun
along the stack when parsing for an integer value.  Fix this by
instead using a 2 char string that is initialized to all zeros
to ensure that a 1 char read into the string is always terminated
with a \0.

Detected by cppcheck:
"Invalid atoi() argument nr 1. A nul-terminated string is required."

Fixes: 3391ba0e ("usbip: tools: Extract generic code to be shared with vudc backend")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 09015855
...@@ -43,7 +43,7 @@ static int32_t read_attr_usbip_status(struct usbip_usb_device *udev) ...@@ -43,7 +43,7 @@ static int32_t read_attr_usbip_status(struct usbip_usb_device *udev)
int size; int size;
int fd; int fd;
int length; int length;
char status; char status[2] = { 0 };
int value = 0; int value = 0;
size = snprintf(status_attr_path, sizeof(status_attr_path), size = snprintf(status_attr_path, sizeof(status_attr_path),
...@@ -61,14 +61,14 @@ static int32_t read_attr_usbip_status(struct usbip_usb_device *udev) ...@@ -61,14 +61,14 @@ static int32_t read_attr_usbip_status(struct usbip_usb_device *udev)
return -1; return -1;
} }
length = read(fd, &status, 1); length = read(fd, status, 1);
if (length < 0) { if (length < 0) {
err("error reading attribute %s", status_attr_path); err("error reading attribute %s", status_attr_path);
close(fd); close(fd);
return -1; return -1;
} }
value = atoi(&status); value = atoi(status);
return value; return value;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment