diff options
author | Juan Zea <juan.zea@qindel.com> | 2017-12-15 04:21:20 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-19 05:40:55 -0500 |
commit | 544c4605acc5ae4afe7dd5914147947db182f2fb (patch) | |
tree | 75bb4c70d73b0cc4cf56e09076551cbbdb466bb6 /tools/usb/usbip/src | |
parent | 10c90120930628e8b959bf58d4a0aaef3ae5d945 (diff) |
usbip: fix usbip bind writing random string after command in match_busid
usbip bind writes commands followed by random string when writing to
match_busid attribute in sysfs, caused by using full variable size
instead of string length.
Signed-off-by: Juan Zea <juan.zea@qindel.com>
Acked-by: Shuah Khan <shuahkh@osg.samsung.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/usb/usbip/src')
-rw-r--r-- | tools/usb/usbip/src/utils.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/usb/usbip/src/utils.c b/tools/usb/usbip/src/utils.c index 2b3d6d235015..3d7b42e77299 100644 --- a/tools/usb/usbip/src/utils.c +++ b/tools/usb/usbip/src/utils.c | |||
@@ -30,6 +30,7 @@ int modify_match_busid(char *busid, int add) | |||
30 | char command[SYSFS_BUS_ID_SIZE + 4]; | 30 | char command[SYSFS_BUS_ID_SIZE + 4]; |
31 | char match_busid_attr_path[SYSFS_PATH_MAX]; | 31 | char match_busid_attr_path[SYSFS_PATH_MAX]; |
32 | int rc; | 32 | int rc; |
33 | int cmd_size; | ||
33 | 34 | ||
34 | snprintf(match_busid_attr_path, sizeof(match_busid_attr_path), | 35 | snprintf(match_busid_attr_path, sizeof(match_busid_attr_path), |
35 | "%s/%s/%s/%s/%s/%s", SYSFS_MNT_PATH, SYSFS_BUS_NAME, | 36 | "%s/%s/%s/%s/%s/%s", SYSFS_MNT_PATH, SYSFS_BUS_NAME, |
@@ -37,12 +38,14 @@ int modify_match_busid(char *busid, int add) | |||
37 | attr_name); | 38 | attr_name); |
38 | 39 | ||
39 | if (add) | 40 | if (add) |
40 | snprintf(command, SYSFS_BUS_ID_SIZE + 4, "add %s", busid); | 41 | cmd_size = snprintf(command, SYSFS_BUS_ID_SIZE + 4, "add %s", |
42 | busid); | ||
41 | else | 43 | else |
42 | snprintf(command, SYSFS_BUS_ID_SIZE + 4, "del %s", busid); | 44 | cmd_size = snprintf(command, SYSFS_BUS_ID_SIZE + 4, "del %s", |
45 | busid); | ||
43 | 46 | ||
44 | rc = write_sysfs_attribute(match_busid_attr_path, command, | 47 | rc = write_sysfs_attribute(match_busid_attr_path, command, |
45 | sizeof(command)); | 48 | cmd_size); |
46 | if (rc < 0) { | 49 | if (rc < 0) { |
47 | dbg("failed to write match_busid: %s", strerror(errno)); | 50 | dbg("failed to write match_busid: %s", strerror(errno)); |
48 | return -1; | 51 | return -1; |