Skip to content

Commit c68f345

Browse files
mikoxyzdavem330
authored andcommitted
net/usb: kalmia: Don't pass act_len in usb_bulk_msg error path
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: d402612 ("net/usb: Add Samsung Kalmia driver for Samsung GT-B3730") Reported-and-tested-by: [email protected] Signed-off-by: Miko Larsson <[email protected]> Reviewed-by: Alexander Duyck <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 2fa28f5 commit c68f345

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/net/usb/kalmia.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ kalmia_send_init_packet(struct usbnet *dev, u8 *init_msg, u8 init_msg_len,
6565
init_msg, init_msg_len, &act_len, KALMIA_USB_TIMEOUT);
6666
if (status != 0) {
6767
netdev_err(dev->net,
68-
"Error sending init packet. Status %i, length %i\n",
69-
status, act_len);
68+
"Error sending init packet. Status %i\n",
69+
status);
7070
return status;
7171
}
7272
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,
8383

8484
if (status != 0)
8585
netdev_err(dev->net,
86-
"Error receiving init result. Status %i, length %i\n",
87-
status, act_len);
86+
"Error receiving init result. Status %i\n",
87+
status);
8888
else if (act_len != expected_len)
8989
netdev_err(dev->net, "Unexpected init result length: %i\n",
9090
act_len);

0 commit comments

Comments
 (0)