Skip to content

Commit 49cf3ee

Browse files
author
CIQ Kernel Automation
committed
net/usb: kalmia: Don't pass act_len in usb_bulk_msg error path
jira VULN-35526 cve CVE-2023-52703 commit-author Miko Larsson <mikoxyzzz@gmail.com> commit c68f345 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: syzbot+cd80c5ef5121bfe85b55@syzkaller.appspotmail.com Signed-off-by: Miko Larsson <mikoxyzzz@gmail.com> Reviewed-by: Alexander Duyck <alexanderduyck@fb.com> Signed-off-by: David S. Miller <davem@davemloft.net> (cherry picked from commit c68f345) Signed-off-by: CIQ Kernel Automation <ciq_kernel_automation@ciq.com>
1 parent 69f3e73 commit 49cf3ee

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

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)