linux-usb.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* usbip: fix usbip bind writing random string after command in match_busid
@ 2017-12-13 10:16 Juan Zea
  0 siblings, 0 replies; 8+ messages in thread
From: Juan Zea @ 2017-12-13 10:16 UTC (permalink / raw)
  To: 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 | 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;

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* usbip: fix usbip bind writing random string after command in match_busid
@ 2017-12-13 10:56 Greg Kroah-Hartman
  0 siblings, 0 replies; 8+ messages in thread
From: Greg Kroah-Hartman @ 2017-12-13 10:56 UTC (permalink / raw)
  To: Juan Zea; +Cc: linux-usb

On Wed, Dec 13, 2017 at 11:16:03AM +0100, 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(-)

You forgot to cc: the maintainers of this file:

$ ./scripts/get_maintainer.pl --file tools/usb/usbip/src/utils.c
Valentina Manea <valentina.manea.m@gmail.com> (maintainer:USB OVER IP DRIVER)
Shuah Khan <shuah@kernel.org> (maintainer:USB OVER IP DRIVER)
linux-usb@vger.kernel.org (open list:USB OVER IP DRIVER)
linux-kernel@vger.kernel.org (open list)
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 8+ messages in thread

* usbip: fix usbip bind writing random string after command in match_busid
@ 2017-12-13 11:07 Juan Zea
  0 siblings, 0 replies; 8+ messages in thread
From: Juan Zea @ 2017-12-13 11:07 UTC (permalink / raw)
  To: linux-usb; +Cc: Valentina Manea, Shuah Khan, 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;

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* usbip: fix usbip bind writing random string after command in match_busid
@ 2017-12-13 17:42 Shuah Khan
  0 siblings, 0 replies; 8+ 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
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 8+ messages in thread

* usbip: fix usbip bind writing random string after command in match_busid
@ 2017-12-14 10:23 Juan Zea
  0 siblings, 0 replies; 8+ 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?



Regards,
Juan
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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;

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* usbip: fix usbip bind writing random string after command in match_busid
@ 2017-12-14 20:14 Shuah Khan
  0 siblings, 0 replies; 8+ 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
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 8+ messages in thread

* usbip: fix usbip bind writing random string after command in match_busid
@ 2017-12-15  9:21 Juan Zea
  0 siblings, 0 replies; 8+ 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

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;

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* usbip: fix usbip bind writing random string after command in match_busid
@ 2017-12-15 17:39 Shuah Khan
  0 siblings, 0 replies; 8+ 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
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2017-12-15 17:39 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-15  9:21 usbip: fix usbip bind writing random string after command in match_busid Juan Zea
  -- strict thread matches above, loose matches on Subject: below --
2017-12-15 17:39 Shuah Khan
2017-12-14 20:14 Shuah Khan
2017-12-14 10:23 Juan Zea
2017-12-13 17:42 Shuah Khan
2017-12-13 11:07 Juan Zea
2017-12-13 10:56 Greg Kroah-Hartman
2017-12-13 10:16 Juan Zea

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).