Skip to contentSkip to conversation

USB: legousbtower: fix a signedness bug in tower_probe()

PATCH Superseded Dan Carpenter 3 participants 7 messages Oct 11, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 USB: legousbtower: fix a signedness bug in tower_probe()

The problem is that sizeof() is unsigned long so negative error codes are type promoted to high positive values and the condition becomes false.

Fixes 1d427be4a39d ("USB: legousbtower: fix slab info leak at probe")
---
 drivers/usb/misc/legousbtower.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/misc/legousbtower.c +1 -1
index 9d4c52a7ebe0..835908fe1e65 100644
@@ -881,7 +881,7 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device
 				  get_version_reply,
 				  sizeof(*get_version_reply),
 				  1000);
-	if (result < sizeof(*get_version_reply)) {
+	if (result < 0 || result < sizeof(*get_version_reply)) {
 		if (result >= 0)
 			result = -EIO;
 		dev_err(idev, "get version request failed: %d\n", result);
Signature · 1 line
2.20.1
#1 lore raw

Am 11.10.2019 15:35, schrieb Dan Carpenter:

Quoted 15 lines

The problem is that sizeof() is unsigned long so negative error codes are type promoted to high positive values and the condition becomes false.

Fixes 1d427be4a39d ("USB: legousbtower: fix slab info leak at probe")
---
 drivers/usb/misc/legousbtower.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/misc/legousbtower.c +0 -0
index 9d4c52a7ebe0..835908fe1e65 100644

drivers/usb/misc/legousbtower.c static int tower_probe (struct usb_interface *interface, const struct usb_device · line 887

Quoted 8 lines
drivers/usb/misc/legousbtower.c +1 -1
@@ -881,7 +881,7 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device
 				  get_version_reply,
 				  sizeof(*get_version_reply),
 				  1000);
-	if (result < sizeof(*get_version_reply)) {
+	if (result < 0 || result < sizeof(*get_version_reply)) {
 		if (result >= 0)
 			result = -EIO;
 		dev_err(idev, "get version request failed: %d\n", result);

i am not an USB expert but it seems that this is a complicated way to check for result != sizeof(*get_version_reply).

re,
wh

#2 lore raw
Quoted 13 lines · walter harms

Am 11.10.2019 15:35, schrieb Dan Carpenter:

Quoted 10 lines

The problem is that sizeof() is unsigned long so negative error codes are type promoted to high positive values and the condition becomes false.

Fixes 1d427be4a39d ("USB: legousbtower: fix slab info leak at probe")
---
 drivers/usb/misc/legousbtower.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 16 lines

drivers/usb/misc/legousbtower.c static int tower_probe (struct usb_interface *interface, const struct usb_device · line 887

Quoted 13 lines
drivers/usb/misc/legousbtower.c +1 -1
index 9d4c52a7ebe0..835908fe1e65 100644
@@ -881,7 +881,7 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device
 				  get_version_reply,
 				  sizeof(*get_version_reply),
 				  1000);
-	if (result < sizeof(*get_version_reply)) {
+	if (result < 0 || result < sizeof(*get_version_reply)) {
 		if (result >= 0)
 			result = -EIO;
 		dev_err(idev, "get version request failed: %d\n", result);

i am not an USB expert but it seems that this is a complicated way to check for result != sizeof(*get_version_reply).

Yeah. You're right. That would look nicer. I will resend.

regards,
dan carpenter

#3 lore raw
Quoted 31 lines · Dan Carpenter
Quoted 13 lines · walter harms

Am 11.10.2019 15:35, schrieb Dan Carpenter:

Quoted 10 lines

The problem is that sizeof() is unsigned long so negative error codes are type promoted to high positive values and the condition becomes false.

Fixes 1d427be4a39d ("USB: legousbtower: fix slab info leak at probe")
---
 drivers/usb/misc/legousbtower.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 16 lines

drivers/usb/misc/legousbtower.c static int tower_probe (struct usb_interface *interface, const struct usb_device · line 887

Quoted 13 lines
drivers/usb/misc/legousbtower.c +1 -1
index 9d4c52a7ebe0..835908fe1e65 100644
@@ -881,7 +881,7 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device
 				  get_version_reply,
 				  sizeof(*get_version_reply),
 				  1000);
-	if (result < sizeof(*get_version_reply)) {
+	if (result < 0 || result < sizeof(*get_version_reply)) {
 		if (result >= 0)
 			result = -EIO;
 		dev_err(idev, "get version request failed: %d\n", result);

i am not an USB expert but it seems that this is a complicated way to check for result != sizeof(*get_version_reply).

Quoted 1 line

Yeah. You're right. That would look nicer. I will resend.

Your version, or adding an explicit cast to int, may be preferred as they document that there's something to watch out for here.

Either way you have my ack.

Johan

#4 lore raw

PATCH v2 1/1 USB: legousbtower: fix a signedness bug in tower_probe()

In reply to walter harms

The problem is that sizeof() is unsigned long so negative error codes are type promoted to high positive values and the condition becomes false.

Fixes 1d427be4a39d ("USB: legousbtower: fix slab info leak at probe")

---
v2: style improvement suggested by Walter Harms.

 drivers/usb/misc/legousbtower.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/misc/legousbtower.c +1 -1
index 9d4c52a7ebe0..9bd240df8f4c 100644
@@ -881,7 +881,7 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device
 				  get_version_reply,
 				  sizeof(*get_version_reply),
 				  1000);
-	if (result < sizeof(*get_version_reply)) {
+	if (result != sizeof(*get_version_reply)) {
 		if (result >= 0)
 			result = -EIO;
 		dev_err(idev, "get version request failed: %d\n", result);
Signature · 1 line
2.20.1
Acked-by on v2 1/1
#5 lore raw
Quoted 6 lines · Dan Carpenter

The problem is that sizeof() is unsigned long so negative error codes are type promoted to high positive values and the condition becomes false.

Fixes 1d427be4a39d ("USB: legousbtower: fix slab info leak at probe")
Quoted 19 lines

---
v2: style improvement suggested by Walter Harms.

 drivers/usb/misc/legousbtower.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/misc/legousbtower.c +1 -1
index 9d4c52a7ebe0..9bd240df8f4c 100644
@@ -881,7 +881,7 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device
 				  get_version_reply,
 				  sizeof(*get_version_reply),
 				  1000);
-	if (result < sizeof(*get_version_reply)) {
+	if (result != sizeof(*get_version_reply)) {
 		if (result >= 0)
 			result = -EIO;
 		dev_err(idev, "get version request failed: %d\n", result);
Acked-by on v1 1/1
#6 lore raw
In reply to Dan Carpenter
Quoted 15 lines · Dan Carpenter

The problem is that sizeof() is unsigned long so negative error codes are type promoted to high positive values and the condition becomes false.

Fixes 1d427be4a39d ("USB: legousbtower: fix slab info leak at probe")
---
 drivers/usb/misc/legousbtower.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/misc/legousbtower.c +0 -0
index 9d4c52a7ebe0..835908fe1e65 100644

drivers/usb/misc/legousbtower.c static int tower_probe (struct usb_interface *interface, const struct usb_device · line 887

Quoted 8 lines
drivers/usb/misc/legousbtower.c +1 -1
@@ -881,7 +881,7 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device
 				  get_version_reply,
 				  sizeof(*get_version_reply),
 				  1000);
-	if (result < sizeof(*get_version_reply)) {
+	if (result < 0 || result < sizeof(*get_version_reply)) {
 		if (result >= 0)
 			result = -EIO;
 		dev_err(idev, "get version request failed: %d\n", result);

Bah, I should have noticed.

Thanks for fixing this!

Johan