Skip to contentSkip to conversation

net/usb: kalmia: Fix uninit-value in kalmia_send_init_packet

PATCH Superseded Miko Larsson 5 participants 11 messages Jan 31, 2023 – Feb 13, 2023

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

PATCH 1/1 net/usb: kalmia: Fix uninit-value in kalmia_send_init_packet

From ef617d8df22945b871ab989e25c07d7c60ae21f6 Mon Sep 17 00:00:00 2001
From: Miko Larsson <[email protected]>
Date: Tue, 31 Jan 2023 11:01:20 +0100
Subject: [UNTESTED PATCH] net/usb: kalmia: Fix uninit-value in kalmia_send_init_packet

syzbot reports that act_len in kalmia_send_init_packet() is uninitialized. Attempt to fix this by initializing it to 0.

Fixes d40261236e8e ("net/usb: Add Samsung Kalmia driver for Samsung GT-B3730")
Reported-by [email protected]
---
 drivers/net/usb/kalmia.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/usb/kalmia.c +1 -1
index 9f2b70ef39aa..b158fb7bf66a 100644
@@ -56,7 +56,7 @@ static int
 kalmia_send_init_packet(struct usbnet *dev, u8 *init_msg, u8 init_msg_len,
 	u8 *buffer, u8 expected_len)
 {
-	int act_len;
+	int act_len = 0;
 	int status;
 
 	netdev_dbg(dev->net, "Sending init packet");
Signature · 1 line
2.39.1
maintainer
#1 lore raw
Quoted 3 lines · Miko Larsson
Quoted 1 line

From ef617d8df22945b871ab989e25c07d7c60ae21f6 Mon Sep 17 00:00:00 2001

From: Miko Larsson <[email protected]>
Date: Tue, 31 Jan 2023 11:01:20 +0100

Why is this in the changelog text?

Quoted 4 lines

Subject: [UNTESTED PATCH] net/usb: kalmia: Fix uninit-value in kalmia_send_init_packet

syzbot reports that act_len in kalmia_send_init_packet() is uninitialized. Attempt to fix this by initializing it to 0.

You can send patches to syzbot to have it test things, have you tried that?

thanks,

greg k-h

#2 lore raw
Quoted 7 lines · Greg KH
Quoted 4 lines · Miko Larsson
Quoted 2 lines

From ef617d8df22945b871ab989e25c07d7c60ae21f6 Mon Sep 17 00:00:00 2001

From: Miko Larsson <[email protected]>
Date: Tue, 31 Jan 2023 11:01:20 +0100

Why is this in the changelog text?

D'oh, sorry about that. Imported the patch directly into Evolution without trimming that away.

Quoted 8 lines
Quoted 5 lines

Subject: [UNTESTED PATCH] net/usb: kalmia: Fix uninit-value in kalmia_send_init_packet

syzbot reports that act_len in kalmia_send_init_packet() is uninitialized. Attempt to fix this by initializing it to 0.

You can send patches to syzbot to have it test things, have you tried that?

Didn't know that, will try!

Signature · 1 line
~miko
#3 lore raw

PATCH v2 1/1 net/usb: kalmia: Fix uninit-value in kalmia_send_init_packet

In reply to Miko Larsson

syzbot reports that act_len in kalmia_send_init_packet() is uninitialized. Fix this by initializing it to 0.

Fixes d40261236e8e ("net/usb: Add Samsung Kalmia driver for Samsung GT-B3730")
Reported-and-tested-by [email protected]

---
v1 -> v2
* Minor alteration of commit message.
* Added 'reported-and-tested-by' which is attributed to syzbot.

 drivers/net/usb/kalmia.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/usb/kalmia.c +1 -1
index 9f2b70ef39aa..b158fb7bf66a 100644
@@ -56,7 +56,7 @@ static int
 kalmia_send_init_packet(struct usbnet *dev, u8 *init_msg, u8 init_msg_len,
 	u8 *buffer, u8 expected_len)
 {
-	int act_len;
+	int act_len = 0;
 	int status;
 
 	netdev_dbg(dev->net, "Sending init packet");
Signature · 1 line
2.39.1
#5 lore raw
In reply to Miko Larsson
Quoted 19 lines · Tue, Jan 31, 2023 at 03:20:33PM CET, [email protected] wrote:

syzbot reports that act_len in kalmia_send_init_packet() is uninitialized. Fix this by initializing it to 0.

Fixes d40261236e8e ("net/usb: Add Samsung Kalmia driver for Samsung GT-B3730")
Reported-and-tested-by [email protected]

---
v1 -> v2
* Minor alteration of commit message.
* Added 'reported-and-tested-by' which is attributed to syzbot.

drivers/net/usb/kalmia.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/usb/kalmia.c +0 -0
index 9f2b70ef39aa..b158fb7bf66a 100644

drivers/net/usb/kalmia.c static int · line 62

Quoted 8 lines
drivers/net/usb/kalmia.c +1 -1
@@ -56,7 +56,7 @@ static int
 kalmia_send_init_packet(struct usbnet *dev, u8 *init_msg, u8 init_msg_len,
 	u8 *buffer, u8 expected_len)
 {
-	int act_len;
+	int act_len = 0;
 	int status;
 
 	netdev_dbg(dev->net, "Sending init packet");

Hmm, this is not the right fix.

If the second call of usb_bulk_msg() in this function returns != 0, the act_len printed out contains the value from previous usb_bulk_msg() call, which does not make sense.

Printing act_len on error path is pointless, so rather remove it from the error message entirely for both usb_bulk_msg() calls.

#6 lore raw
Quoted 34 lines · Jiri Pirko
Quoted 29 lines · Tue, Jan 31, 2023 at 03:20:33PM CET, [email protected] wrote:

syzbot reports that act_len in kalmia_send_init_packet() is uninitialized. Fix this by initializing it to 0.

Fixes d40261236e8e ("net/usb: Add Samsung Kalmia driver for

Samsung GT-B3730")
Reported-and-tested-by:
[email protected]

---
v1 -> v2
* Minor alteration of commit message.
* Added 'reported-and-tested-by' which is attributed to syzbot.

drivers/net/usb/kalmia.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/usb/kalmia.c +0 -0
index 9f2b70ef39aa..b158fb7bf66a 100644
@@ -56,7 +56,7 @@ static int

kalmia_send_init_packet(struct usbnet *dev, u8 *init_msg, u8 init_msg_len,
        u8 *buffer, u8 expected_len)
{
-       int act_len;
+       int act_len = 0;
        int status;

Quoted 1 line

        netdev_dbg(dev->net, "Sending init packet");

Hmm, this is not the right fix.

Quoted 8 lines

If the second call of usb_bulk_msg() in this function returns != 0, the
act_len printed out contains the value from previous usb_bulk_msg() call,
which does not make sense.

Printing act_len on error path is pointless, so rather remove it from the error message entirely for both usb_bulk_msg() calls.

Something like this, then?

drivers/net/usb/kalmia.c +4 -4
index 9f2b70ef39aa..613fc6910f14 100644
@@ -65,8 +65,8 @@ kalmia_send_init_packet(struct usbnet *dev, u8 *init_msg, u8 init_msg_len,
 		init_msg, init_msg_len, &act_len, KALMIA_USB_TIMEOUT);
 	if (status != 0) {
 		netdev_err(dev->net,
-			"Error sending init packet. Status %i, length %i\n",
-			status, act_len);
+			"Error sending init packet. Status %i\n",
+			status);
 		return status;
 	}
 	else if (act_len != init_msg_len) {
@@ -83,8 +83,8 @@ kalmia_send_init_packet(struct usbnet *dev, u8 *init_msg, u8 init_msg_len,
 
 	if (status != 0)
 		netdev_err(dev->net,
-			"Error receiving init result. Status %i, length %i\n",
-			status, act_len);
+			"Error receiving init result. Status %i\n",
+			status);
 	else if (act_len != expected_len)
 		netdev_err(dev->net, "Unexpected init result length: %i\n",
 			act_len);
Signature · 1 line
~miko
#7 lore raw
Quoted 41 lines · Thu, Feb 09, 2023 at 03:47:12PM CET, [email protected] wrote:
Quoted 40 lines · Jiri Pirko
Quoted 29 lines · Tue, Jan 31, 2023 at 03:20:33PM CET, [email protected] wrote:

syzbot reports that act_len in kalmia_send_init_packet() is uninitialized. Fix this by initializing it to 0.

Fixes d40261236e8e ("net/usb: Add Samsung Kalmia driver for

Samsung GT-B3730")
Reported-and-tested-by:
[email protected]

---
v1 -> v2
* Minor alteration of commit message.
* Added 'reported-and-tested-by' which is attributed to syzbot.

drivers/net/usb/kalmia.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/usb/kalmia.c +0 -0
index 9f2b70ef39aa..b158fb7bf66a 100644
@@ -56,7 +56,7 @@ static int

kalmia_send_init_packet(struct usbnet *dev, u8 *init_msg, u8 init_msg_len,
        u8 *buffer, u8 expected_len)
{
-       int act_len;
+       int act_len = 0;
        int status;

Quoted 1 line

        netdev_dbg(dev->net, "Sending init packet");

Hmm, this is not the right fix.

If the second call of usb_bulk_msg() in this function returns != 0, the
act_len printed out contains the value from previous usb_bulk_msg() call,
which does not make sense.

Quoted 4 lines
Quoted 2 lines

Printing act_len on error path is pointless, so rather remove it from the error message entirely for both usb_bulk_msg() calls.

Something like this, then?

Yes.

Quoted 30 lines
drivers/net/usb/kalmia.c +4 -4
index 9f2b70ef39aa..613fc6910f14 100644
@@ -65,8 +65,8 @@ kalmia_send_init_packet(struct usbnet *dev, u8 *init_msg, u8 init_msg_len,
 		init_msg, init_msg_len, &act_len, KALMIA_USB_TIMEOUT);
 	if (status != 0) {
 		netdev_err(dev->net,
-			"Error sending init packet. Status %i, length %i\n",
-			status, act_len);
+			"Error sending init packet. Status %i\n",
+			status);
 		return status;
 	}
 	else if (act_len != init_msg_len) {
@@ -83,8 +83,8 @@ kalmia_send_init_packet(struct usbnet *dev, u8 *init_msg, u8 init_msg_len,
 
 	if (status != 0)
 		netdev_err(dev->net,
-			"Error receiving init result. Status %i, length %i\n",
-			status, act_len);
+			"Error receiving init result. Status %i\n",
+			status);
 	else if (act_len != expected_len)
 		netdev_err(dev->net, "Unexpected init result length: %i\n",
 			act_len);
Signature · 2 lines
-- 
~miko
#8 lore raw

PATCH 1/1 net/usb: kalmia: Don't pass act_len in usb_bulk_msg error path

In reply to Miko Larsson

syzbot reported that act_len in kalmia_send_init_packet() is uninitialized when passing it to the first usb_bulk_msg error path. Jiri Pirko noted that it's pointless to pass it in the error path, and that the value that would be printed in the second error path would be the value of act_len from the first call to usb_bulk_msg.[1]

With this in mind, let's just not pass act_len to the usb_bulk_msg error paths.

1: https://lore.kernel.org/lkml/Y9pY61y1nwTuzMOa@nanopsycho/

Fixes d40261236e8e ("net/usb: Add Samsung Kalmia driver for Samsung GT-B3730")
Reported-and-tested-by [email protected]
---
 drivers/net/usb/kalmia.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/usb/kalmia.c +4 -4
index 9f2b70ef39aa..613fc6910f14 100644
@@ -65,8 +65,8 @@ kalmia_send_init_packet(struct usbnet *dev, u8 *init_msg, u8 init_msg_len,
 		init_msg, init_msg_len, &act_len, KALMIA_USB_TIMEOUT);
 	if (status != 0) {
 		netdev_err(dev->net,
-			"Error sending init packet. Status %i, length %i\n",
-			status, act_len);
+			"Error sending init packet. Status %i\n",
+			status);
 		return status;
 	}
 	else if (act_len != init_msg_len) {
@@ -83,8 +83,8 @@ kalmia_send_init_packet(struct usbnet *dev, u8 *init_msg, u8 init_msg_len,
 
 	if (status != 0)
 		netdev_err(dev->net,
-			"Error receiving init result. Status %i, length %i\n",
-			status, act_len);
+			"Error receiving init result. Status %i\n",
+			status);
 	else if (act_len != expected_len)
 		netdev_err(dev->net, "Unexpected init result length: %i\n",
 			act_len);
Signature · 1 line
2.39.1
Reviewed-by Alexander Duyck on v1 1/1
#9 lore raw

Re: [PATCH] net/usb: kalmia: Don't pass act_len in usb_bulk_msg error path

Quoted 34 lines · Miko Larsson

syzbot reported that act_len in kalmia_send_init_packet() is uninitialized when passing it to the first usb_bulk_msg error path. Jiri Pirko noted that it's pointless to pass it in the error path, and that the value that would be printed in the second error path would be the value of act_len from the first call to usb_bulk_msg.[1]

With this in mind, let's just not pass act_len to the usb_bulk_msg error paths.

1: https://lore.kernel.org/lkml/Y9pY61y1nwTuzMOa@nanopsycho/

Fixes d40261236e8e ("net/usb: Add Samsung Kalmia driver for Samsung GT-B3730")
Reported-and-tested-by [email protected]
---
 drivers/net/usb/kalmia.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/usb/kalmia.c +2 -2
index 9f2b70ef39aa..613fc6910f14 100644
@@ -65,8 +65,8 @@ kalmia_send_init_packet(struct usbnet *dev, u8 *init_msg, u8 init_msg_len,
 		init_msg, init_msg_len, &act_len, KALMIA_USB_TIMEOUT);
 	if (status != 0) {
 		netdev_err(dev->net,
-			"Error sending init packet. Status %i, length %i\n",
-			status, act_len);
+			"Error sending init packet. Status %i\n",
+			status);
 		return status;
 	}
 	else if (act_len != init_msg_len) {

drivers/net/usb/kalmia.c kalmia_send_init_packet(struct usbnet *dev, u8 *init_msg, u8 init_msg_len, · line 90

Quoted 10 lines
drivers/net/usb/kalmia.c +2 -2
@@ -83,8 +83,8 @@ kalmia_send_init_packet(struct usbnet *dev, u8 *init_msg, u8 init_msg_len,
 
 	if (status != 0)
 		netdev_err(dev->net,
-			"Error receiving init result. Status %i, length %i\n",
-			status, act_len);
+			"Error receiving init result. Status %i\n",
+			status);
 	else if (act_len != expected_len)
 		netdev_err(dev->net, "Unexpected init result length: %i\n",
 			act_len);

Makes sense to me since the only possible return values for act_len appear to be either uninitialized or 0 depending on where it fails.

#10 lore raw

Re: [PATCH] net/usb: kalmia: Don't pass act_len in usb_bulk_msg error path

In reply to Miko Larsson
This patch was applied to netdev/net.git (master) by David S. Miller <[email protected]>:

Hello:

This patch was applied to netdev/net.git (master)
by David S. Miller <[email protected]>:

Quoted 10 lines · On Fri, 10 Feb 2023 09:13:44 +0100 you wrote:

syzbot reported that act_len in kalmia_send_init_packet() is uninitialized when passing it to the first usb_bulk_msg error path. Jiri Pirko noted that it's pointless to pass it in the error path, and that the value that would be printed in the second error path would be the value of act_len from the first call to usb_bulk_msg.[1]

With this in mind, let's just not pass act_len to the usb_bulk_msg error paths.

[...]

Here is the summary with links:
- net/usb: kalmia: Don't pass act_len in usb_bulk_msg error path

    https://git.kernel.org/netdev/net/c/c68f345b7c42

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html