Commit f9d286ee authored by Juan Zea's avatar Juan Zea Committed by Kleber Sacilotto de Souza

usbip: fix usbip bind writing random string after command in match_busid

BugLink: http://bugs.launchpad.net/bugs/1745069

commit 544c4605 upstream.

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: default avatarJuan Zea <juan.zea@qindel.com>
Acked-by: default avatarShuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
parent dcfc56f3
...@@ -30,6 +30,7 @@ int modify_match_busid(char *busid, int add) ...@@ -30,6 +30,7 @@ int modify_match_busid(char *busid, int add)
char command[SYSFS_BUS_ID_SIZE + 4]; char command[SYSFS_BUS_ID_SIZE + 4];
char match_busid_attr_path[SYSFS_PATH_MAX]; char match_busid_attr_path[SYSFS_PATH_MAX];
int rc; int rc;
int cmd_size;
snprintf(match_busid_attr_path, sizeof(match_busid_attr_path), snprintf(match_busid_attr_path, sizeof(match_busid_attr_path),
"%s/%s/%s/%s/%s/%s", SYSFS_MNT_PATH, SYSFS_BUS_NAME, "%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,12 +38,14 @@ int modify_match_busid(char *busid, int add)
attr_name); attr_name);
if (add) if (add)
snprintf(command, SYSFS_BUS_ID_SIZE + 4, "add %s", busid); cmd_size = snprintf(command, SYSFS_BUS_ID_SIZE + 4, "add %s",
busid);
else else
snprintf(command, SYSFS_BUS_ID_SIZE + 4, "del %s", busid); cmd_size = snprintf(command, SYSFS_BUS_ID_SIZE + 4, "del %s",
busid);
rc = write_sysfs_attribute(match_busid_attr_path, command, rc = write_sysfs_attribute(match_busid_attr_path, command,
sizeof(command)); cmd_size);
if (rc < 0) { if (rc < 0) {
dbg("failed to write match_busid: %s", strerror(errno)); dbg("failed to write match_busid: %s", strerror(errno));
return -1; return -1;
......
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