* [PATCH] usbip: fix usbip bind writing random string after command in match_busid [not found] <204103862.1370220.1513160163538.JavaMail.zimbra@qindel.com> @ 2017-12-13 11:07 ` Juan Zea 2017-12-13 17:42 ` Shuah Khan 0 siblings, 1 reply; 6+ messages in thread From: Juan Zea @ 2017-12-13 11:07 UTC (permalink / raw) To: linux-usb; +Cc: Valentina Manea, Shuah Khan, linux-usb, linux-kernel 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> --- tools/usb/usbip/src/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/usb/usbip/src/utils.c b/tools/usb/usbip/src/utils.c index 2b3d6d2..ea1a1af 100644 --- a/tools/usb/usbip/src/utils.c +++ b/tools/usb/usbip/src/utils.c @@ -42,7 +42,7 @@ int modify_match_busid(char *busid, int add) snprintf(command, SYSFS_BUS_ID_SIZE + 4, "del %s", busid); rc = write_sysfs_attribute(match_busid_attr_path, command, - sizeof(command)); + strlen(command)); if (rc < 0) { dbg("failed to write match_busid: %s", strerror(errno)); return -1; -- 2.7.4 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] usbip: fix usbip bind writing random string after command in match_busid 2017-12-13 11:07 ` [PATCH] usbip: fix usbip bind writing random string after command in match_busid Juan Zea @ 2017-12-13 17:42 ` Shuah Khan 2017-12-14 10:23 ` Juan Zea 0 siblings, 1 reply; 6+ messages in thread From: Shuah Khan @ 2017-12-13 17:42 UTC (permalink / raw) To: Juan Zea, linux-usb; +Cc: Valentina Manea, linux-kernel, Shuah Khan, Shuah Khan On 12/13/2017 04:07 AM, Juan Zea wrote: > 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> > --- > tools/usb/usbip/src/utils.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/usb/usbip/src/utils.c b/tools/usb/usbip/src/utils.c > index 2b3d6d2..ea1a1af 100644 > --- a/tools/usb/usbip/src/utils.c > +++ b/tools/usb/usbip/src/utils.c > @@ -42,7 +42,7 @@ int modify_match_busid(char *busid, int add) > snprintf(command, SYSFS_BUS_ID_SIZE + 4, "del %s", busid); > > rc = write_sysfs_attribute(match_busid_attr_path, command, > - sizeof(command)); > + strlen(command)); > if (rc < 0) { > dbg("failed to write match_busid: %s", strerror(errno)); > return -1; > Why not use the return value from snprintf() for length, instead of calling strlen(command)? thanks, -- Shuah ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] usbip: fix usbip bind writing random string after command in match_busid 2017-12-13 17:42 ` Shuah Khan @ 2017-12-14 10:23 ` Juan Zea 2017-12-14 20:14 ` Shuah Khan 0 siblings, 1 reply; 6+ messages in thread From: Juan Zea @ 2017-12-14 10:23 UTC (permalink / raw) To: shuah; +Cc: linux-usb, Valentina Manea, linux-kernel, Shuah Khan > Why not use the return value from snprintf() for length, instead of calling strlen(command)? Yes, that makes sense. Something like this? diff --git a/tools/usb/usbip/src/utils.c b/tools/usb/usbip/src/utils.c index 2b3d6d2..3d7b42e 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) 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, @@ -37,12 +38,14 @@ int modify_match_busid(char *busid, int add) 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; Regards, Juan ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] usbip: fix usbip bind writing random string after command in match_busid 2017-12-14 10:23 ` Juan Zea @ 2017-12-14 20:14 ` Shuah Khan 2017-12-15 9:21 ` Juan Zea 0 siblings, 1 reply; 6+ messages in thread From: Shuah Khan @ 2017-12-14 20:14 UTC (permalink / raw) To: Juan Zea, shuah; +Cc: linux-usb, Valentina Manea, linux-kernel, Shuah Khan On 12/14/2017 03:23 AM, Juan Zea wrote: >> Why not use the return value from snprintf() for length, instead of calling > strlen(command)? > > Yes, that makes sense. Something like this? Yes > > diff --git a/tools/usb/usbip/src/utils.c b/tools/usb/usbip/src/utils.c > index 2b3d6d2..3d7b42e 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) > 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, > @@ -37,12 +38,14 @@ int modify_match_busid(char *busid, int add) > 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; > > > Regards, > Juan > thanks, -- Shuah ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] usbip: fix usbip bind writing random string after command in match_busid 2017-12-14 20:14 ` Shuah Khan @ 2017-12-15 9:21 ` Juan Zea 2017-12-15 17:39 ` Shuah Khan 0 siblings, 1 reply; 6+ messages in thread From: Juan Zea @ 2017-12-15 9:21 UTC (permalink / raw) To: linux-usb; +Cc: shuah, Valentina Manea, linux-kernel, Shuah Khan, linux-usb 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> --- tools/usb/usbip/src/utils.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/usb/usbip/src/utils.c b/tools/usb/usbip/src/utils.c index 2b3d6d2..3d7b42e 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) 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, @@ -37,12 +38,14 @@ int modify_match_busid(char *busid, int add) 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; -- 2.7.4 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] usbip: fix usbip bind writing random string after command in match_busid 2017-12-15 9:21 ` Juan Zea @ 2017-12-15 17:39 ` Shuah Khan 0 siblings, 0 replies; 6+ messages in thread From: Shuah Khan @ 2017-12-15 17:39 UTC (permalink / raw) To: Juan Zea, linux-usb, Greg Kroah-Hartman Cc: shuah, Valentina Manea, linux-kernel On 12/15/2017 02:21 AM, Juan Zea wrote: > 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> > --- > tools/usb/usbip/src/utils.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/tools/usb/usbip/src/utils.c b/tools/usb/usbip/src/utils.c > index 2b3d6d2..3d7b42e 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) > 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, > @@ -37,12 +38,14 @@ int modify_match_busid(char *busid, int add) > 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; > Thanks for the patch. Greg, could you please pick this up. Acked-by: Shuah Khan <shuahkh@osg.samsung.com> -- Shuah ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-12-15 17:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <204103862.1370220.1513160163538.JavaMail.zimbra@qindel.com>
2017-12-13 11:07 ` [PATCH] usbip: fix usbip bind writing random string after command in match_busid Juan Zea
2017-12-13 17:42 ` Shuah Khan
2017-12-14 10:23 ` Juan Zea
2017-12-14 20:14 ` Shuah Khan
2017-12-15 9:21 ` Juan Zea
2017-12-15 17:39 ` Shuah Khan
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
Powered by JetHome