Skip to content

Commit

Permalink
usbip: fix usbip bind writing random string after command in match_busid
Browse files Browse the repository at this point in the history
commit 544c460 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: Juan Zea <juan.zea@qindel.com>
Acked-by: Shuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Juan Zea authored and gregkh committed Jan 2, 2018
1 parent 38e8981 commit 2ee11dc
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions tools/usb/usbip/src/utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,22 @@ int modify_match_busid(char *busid, int add)
char command[SYSFS_BUS_ID_SIZE + 4];
char match_busid_attr_path[SYSFS_PATH_MAX];
int rc;
int cmd_size;

snprintf(match_busid_attr_path, sizeof(match_busid_attr_path),
"%s/%s/%s/%s/%s/%s", SYSFS_MNT_PATH, SYSFS_BUS_NAME,
SYSFS_BUS_TYPE, SYSFS_DRIVERS_NAME, USBIP_HOST_DRV_NAME,
attr_name);

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
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,
sizeof(command));
cmd_size);
if (rc < 0) {
dbg("failed to write match_busid: %s", strerror(errno));
return -1;
Expand Down

0 comments on commit 2ee11dc

Please sign in to comment.