* [PATCH] net: usb: smsc75xx: Fix uninit-value access in __smsc75xx_read_reg
@ 2023-09-23 17:35 Shigeru Yoshida
2023-09-28 13:11 ` Simon Horman
2023-10-03 8:30 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Shigeru Yoshida @ 2023-09-23 17:35 UTC (permalink / raw)
To: steve.glendinning
Cc: davem, edumazet, kuba, pabeni, netdev, linux-usb, linux-kernel,
Shigeru Yoshida, syzbot+6966546b78d050bb0b5d
syzbot reported the following uninit-value access issue:
=====================================================
BUG: KMSAN: uninit-value in smsc75xx_wait_ready drivers/net/usb/smsc75xx.c:975 [inline]
BUG: KMSAN: uninit-value in smsc75xx_bind+0x5c9/0x11e0 drivers/net/usb/smsc75xx.c:1482
CPU: 0 PID: 8696 Comm: kworker/0:3 Not tainted 5.8.0-rc5-syzkaller #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
Workqueue: usb_hub_wq hub_event
Call Trace:
__dump_stack lib/dump_stack.c:77 [inline]
dump_stack+0x21c/0x280 lib/dump_stack.c:118
kmsan_report+0xf7/0x1e0 mm/kmsan/kmsan_report.c:121
__msan_warning+0x58/0xa0 mm/kmsan/kmsan_instr.c:215
smsc75xx_wait_ready drivers/net/usb/smsc75xx.c:975 [inline]
smsc75xx_bind+0x5c9/0x11e0 drivers/net/usb/smsc75xx.c:1482
usbnet_probe+0x1152/0x3f90 drivers/net/usb/usbnet.c:1737
usb_probe_interface+0xece/0x1550 drivers/usb/core/driver.c:374
really_probe+0xf20/0x20b0 drivers/base/dd.c:529
driver_probe_device+0x293/0x390 drivers/base/dd.c:701
__device_attach_driver+0x63f/0x830 drivers/base/dd.c:807
bus_for_each_drv+0x2ca/0x3f0 drivers/base/bus.c:431
__device_attach+0x4e2/0x7f0 drivers/base/dd.c:873
device_initial_probe+0x4a/0x60 drivers/base/dd.c:920
bus_probe_device+0x177/0x3d0 drivers/base/bus.c:491
device_add+0x3b0e/0x40d0 drivers/base/core.c:2680
usb_set_configuration+0x380f/0x3f10 drivers/usb/core/message.c:2032
usb_generic_driver_probe+0x138/0x300 drivers/usb/core/generic.c:241
usb_probe_device+0x311/0x490 drivers/usb/core/driver.c:272
really_probe+0xf20/0x20b0 drivers/base/dd.c:529
driver_probe_device+0x293/0x390 drivers/base/dd.c:701
__device_attach_driver+0x63f/0x830 drivers/base/dd.c:807
bus_for_each_drv+0x2ca/0x3f0 drivers/base/bus.c:431
__device_attach+0x4e2/0x7f0 drivers/base/dd.c:873
device_initial_probe+0x4a/0x60 drivers/base/dd.c:920
bus_probe_device+0x177/0x3d0 drivers/base/bus.c:491
device_add+0x3b0e/0x40d0 drivers/base/core.c:2680
usb_new_device+0x1bd4/0x2a30 drivers/usb/core/hub.c:2554
hub_port_connect drivers/usb/core/hub.c:5208 [inline]
hub_port_connect_change drivers/usb/core/hub.c:5348 [inline]
port_event drivers/usb/core/hub.c:5494 [inline]
hub_event+0x5e7b/0x8a70 drivers/usb/core/hub.c:5576
process_one_work+0x1688/0x2140 kernel/workqueue.c:2269
worker_thread+0x10bc/0x2730 kernel/workqueue.c:2415
kthread+0x551/0x590 kernel/kthread.c:292
ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:293
Local variable ----buf.i87@smsc75xx_bind created at:
__smsc75xx_read_reg drivers/net/usb/smsc75xx.c:83 [inline]
smsc75xx_wait_ready drivers/net/usb/smsc75xx.c:968 [inline]
smsc75xx_bind+0x485/0x11e0 drivers/net/usb/smsc75xx.c:1482
__smsc75xx_read_reg drivers/net/usb/smsc75xx.c:83 [inline]
smsc75xx_wait_ready drivers/net/usb/smsc75xx.c:968 [inline]
smsc75xx_bind+0x485/0x11e0 drivers/net/usb/smsc75xx.c:1482
This issue is caused because usbnet_read_cmd() reads less bytes than requested
(zero byte in the reproducer). In this case, 'buf' is not properly filled.
This patch fixes the issue by returning -ENODATA if usbnet_read_cmd() reads
less bytes than requested.
Fixes: d0cad871703b ("smsc75xx: SMSC LAN75xx USB gigabit ethernet adapter driver")
Reported-and-tested-by: syzbot+6966546b78d050bb0b5d@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=6966546b78d050bb0b5d
Signed-off-by: Shigeru Yoshida <syoshida@redhat.com>
---
drivers/net/usb/smsc75xx.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c
index 5d6454fedb3f..78ad2da3ee29 100644
--- a/drivers/net/usb/smsc75xx.c
+++ b/drivers/net/usb/smsc75xx.c
@@ -90,7 +90,9 @@ static int __must_check __smsc75xx_read_reg(struct usbnet *dev, u32 index,
ret = fn(dev, USB_VENDOR_REQUEST_READ_REGISTER, USB_DIR_IN
| USB_TYPE_VENDOR | USB_RECIP_DEVICE,
0, index, &buf, 4);
- if (unlikely(ret < 0)) {
+ if (unlikely(ret < 4)) {
+ ret = ret < 0 ? ret : -ENODATA;
+
netdev_warn(dev->net, "Failed to read reg index 0x%08x: %d\n",
index, ret);
return ret;
--
2.41.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] net: usb: smsc75xx: Fix uninit-value access in __smsc75xx_read_reg
2023-09-23 17:35 [PATCH] net: usb: smsc75xx: Fix uninit-value access in __smsc75xx_read_reg Shigeru Yoshida
@ 2023-09-28 13:11 ` Simon Horman
2023-10-03 8:30 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2023-09-28 13:11 UTC (permalink / raw)
To: Shigeru Yoshida
Cc: steve.glendinning, davem, edumazet, kuba, pabeni, netdev,
linux-usb, linux-kernel, syzbot+6966546b78d050bb0b5d
On Sun, Sep 24, 2023 at 02:35:49AM +0900, Shigeru Yoshida wrote:
> syzbot reported the following uninit-value access issue:
>
> =====================================================
> BUG: KMSAN: uninit-value in smsc75xx_wait_ready drivers/net/usb/smsc75xx.c:975 [inline]
> BUG: KMSAN: uninit-value in smsc75xx_bind+0x5c9/0x11e0 drivers/net/usb/smsc75xx.c:1482
> CPU: 0 PID: 8696 Comm: kworker/0:3 Not tainted 5.8.0-rc5-syzkaller #0
> Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
> Workqueue: usb_hub_wq hub_event
> Call Trace:
> __dump_stack lib/dump_stack.c:77 [inline]
> dump_stack+0x21c/0x280 lib/dump_stack.c:118
> kmsan_report+0xf7/0x1e0 mm/kmsan/kmsan_report.c:121
> __msan_warning+0x58/0xa0 mm/kmsan/kmsan_instr.c:215
> smsc75xx_wait_ready drivers/net/usb/smsc75xx.c:975 [inline]
> smsc75xx_bind+0x5c9/0x11e0 drivers/net/usb/smsc75xx.c:1482
> usbnet_probe+0x1152/0x3f90 drivers/net/usb/usbnet.c:1737
> usb_probe_interface+0xece/0x1550 drivers/usb/core/driver.c:374
> really_probe+0xf20/0x20b0 drivers/base/dd.c:529
> driver_probe_device+0x293/0x390 drivers/base/dd.c:701
> __device_attach_driver+0x63f/0x830 drivers/base/dd.c:807
> bus_for_each_drv+0x2ca/0x3f0 drivers/base/bus.c:431
> __device_attach+0x4e2/0x7f0 drivers/base/dd.c:873
> device_initial_probe+0x4a/0x60 drivers/base/dd.c:920
> bus_probe_device+0x177/0x3d0 drivers/base/bus.c:491
> device_add+0x3b0e/0x40d0 drivers/base/core.c:2680
> usb_set_configuration+0x380f/0x3f10 drivers/usb/core/message.c:2032
> usb_generic_driver_probe+0x138/0x300 drivers/usb/core/generic.c:241
> usb_probe_device+0x311/0x490 drivers/usb/core/driver.c:272
> really_probe+0xf20/0x20b0 drivers/base/dd.c:529
> driver_probe_device+0x293/0x390 drivers/base/dd.c:701
> __device_attach_driver+0x63f/0x830 drivers/base/dd.c:807
> bus_for_each_drv+0x2ca/0x3f0 drivers/base/bus.c:431
> __device_attach+0x4e2/0x7f0 drivers/base/dd.c:873
> device_initial_probe+0x4a/0x60 drivers/base/dd.c:920
> bus_probe_device+0x177/0x3d0 drivers/base/bus.c:491
> device_add+0x3b0e/0x40d0 drivers/base/core.c:2680
> usb_new_device+0x1bd4/0x2a30 drivers/usb/core/hub.c:2554
> hub_port_connect drivers/usb/core/hub.c:5208 [inline]
> hub_port_connect_change drivers/usb/core/hub.c:5348 [inline]
> port_event drivers/usb/core/hub.c:5494 [inline]
> hub_event+0x5e7b/0x8a70 drivers/usb/core/hub.c:5576
> process_one_work+0x1688/0x2140 kernel/workqueue.c:2269
> worker_thread+0x10bc/0x2730 kernel/workqueue.c:2415
> kthread+0x551/0x590 kernel/kthread.c:292
> ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:293
>
> Local variable ----buf.i87@smsc75xx_bind created at:
> __smsc75xx_read_reg drivers/net/usb/smsc75xx.c:83 [inline]
> smsc75xx_wait_ready drivers/net/usb/smsc75xx.c:968 [inline]
> smsc75xx_bind+0x485/0x11e0 drivers/net/usb/smsc75xx.c:1482
> __smsc75xx_read_reg drivers/net/usb/smsc75xx.c:83 [inline]
> smsc75xx_wait_ready drivers/net/usb/smsc75xx.c:968 [inline]
> smsc75xx_bind+0x485/0x11e0 drivers/net/usb/smsc75xx.c:1482
>
> This issue is caused because usbnet_read_cmd() reads less bytes than requested
> (zero byte in the reproducer). In this case, 'buf' is not properly filled.
>
> This patch fixes the issue by returning -ENODATA if usbnet_read_cmd() reads
> less bytes than requested.
>
> Fixes: d0cad871703b ("smsc75xx: SMSC LAN75xx USB gigabit ethernet adapter driver")
> Reported-and-tested-by: syzbot+6966546b78d050bb0b5d@syzkaller.appspotmail.com
> Closes: https://syzkaller.appspot.com/bug?extid=6966546b78d050bb0b5d
> Signed-off-by: Shigeru Yoshida <syoshida@redhat.com>
Reviewed-by: Simon Horman <horms@kernel.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] net: usb: smsc75xx: Fix uninit-value access in __smsc75xx_read_reg
2023-09-23 17:35 [PATCH] net: usb: smsc75xx: Fix uninit-value access in __smsc75xx_read_reg Shigeru Yoshida
2023-09-28 13:11 ` Simon Horman
@ 2023-10-03 8:30 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-10-03 8:30 UTC (permalink / raw)
To: Shigeru Yoshida
Cc: steve.glendinning, davem, edumazet, kuba, pabeni, netdev,
linux-usb, linux-kernel, syzbot+6966546b78d050bb0b5d
Hello:
This patch was applied to netdev/net.git (main)
by Paolo Abeni <pabeni@redhat.com>:
On Sun, 24 Sep 2023 02:35:49 +0900 you wrote:
> syzbot reported the following uninit-value access issue:
>
> =====================================================
> BUG: KMSAN: uninit-value in smsc75xx_wait_ready drivers/net/usb/smsc75xx.c:975 [inline]
> BUG: KMSAN: uninit-value in smsc75xx_bind+0x5c9/0x11e0 drivers/net/usb/smsc75xx.c:1482
> CPU: 0 PID: 8696 Comm: kworker/0:3 Not tainted 5.8.0-rc5-syzkaller #0
> Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
> Workqueue: usb_hub_wq hub_event
> Call Trace:
> __dump_stack lib/dump_stack.c:77 [inline]
> dump_stack+0x21c/0x280 lib/dump_stack.c:118
> kmsan_report+0xf7/0x1e0 mm/kmsan/kmsan_report.c:121
> __msan_warning+0x58/0xa0 mm/kmsan/kmsan_instr.c:215
> smsc75xx_wait_ready drivers/net/usb/smsc75xx.c:975 [inline]
> smsc75xx_bind+0x5c9/0x11e0 drivers/net/usb/smsc75xx.c:1482
> usbnet_probe+0x1152/0x3f90 drivers/net/usb/usbnet.c:1737
> usb_probe_interface+0xece/0x1550 drivers/usb/core/driver.c:374
> really_probe+0xf20/0x20b0 drivers/base/dd.c:529
> driver_probe_device+0x293/0x390 drivers/base/dd.c:701
> __device_attach_driver+0x63f/0x830 drivers/base/dd.c:807
> bus_for_each_drv+0x2ca/0x3f0 drivers/base/bus.c:431
> __device_attach+0x4e2/0x7f0 drivers/base/dd.c:873
> device_initial_probe+0x4a/0x60 drivers/base/dd.c:920
> bus_probe_device+0x177/0x3d0 drivers/base/bus.c:491
> device_add+0x3b0e/0x40d0 drivers/base/core.c:2680
> usb_set_configuration+0x380f/0x3f10 drivers/usb/core/message.c:2032
> usb_generic_driver_probe+0x138/0x300 drivers/usb/core/generic.c:241
> usb_probe_device+0x311/0x490 drivers/usb/core/driver.c:272
> really_probe+0xf20/0x20b0 drivers/base/dd.c:529
> driver_probe_device+0x293/0x390 drivers/base/dd.c:701
> __device_attach_driver+0x63f/0x830 drivers/base/dd.c:807
> bus_for_each_drv+0x2ca/0x3f0 drivers/base/bus.c:431
> __device_attach+0x4e2/0x7f0 drivers/base/dd.c:873
> device_initial_probe+0x4a/0x60 drivers/base/dd.c:920
> bus_probe_device+0x177/0x3d0 drivers/base/bus.c:491
> device_add+0x3b0e/0x40d0 drivers/base/core.c:2680
> usb_new_device+0x1bd4/0x2a30 drivers/usb/core/hub.c:2554
> hub_port_connect drivers/usb/core/hub.c:5208 [inline]
> hub_port_connect_change drivers/usb/core/hub.c:5348 [inline]
> port_event drivers/usb/core/hub.c:5494 [inline]
> hub_event+0x5e7b/0x8a70 drivers/usb/core/hub.c:5576
> process_one_work+0x1688/0x2140 kernel/workqueue.c:2269
> worker_thread+0x10bc/0x2730 kernel/workqueue.c:2415
> kthread+0x551/0x590 kernel/kthread.c:292
> ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:293
>
> [...]
Here is the summary with links:
- net: usb: smsc75xx: Fix uninit-value access in __smsc75xx_read_reg
https://git.kernel.org/netdev/net/c/e9c65989920f
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-03 8:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-23 17:35 [PATCH] net: usb: smsc75xx: Fix uninit-value access in __smsc75xx_read_reg Shigeru Yoshida
2023-09-28 13:11 ` Simon Horman
2023-10-03 8:30 ` patchwork-bot+netdevbpf
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).