diff mbox series

net: usb: smsc75xx: Fix uninit-value access in __smsc75xx_read_reg

Message ID 20230923173549.3284502-1-syoshida@redhat.com (mailing list archive)
State Accepted
Commit e9c65989920f7c28775ec4e0c11b483910fb67b8
Delegated to: Netdev Maintainers
Headers show
Series net: usb: smsc75xx: Fix uninit-value access in __smsc75xx_read_reg | expand

Checks

Context Check Description
netdev/series_format warning Single patches do not need cover letters; Target tree name not specified in the subject
netdev/tree_selection success Guessed tree name to be net-next
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 1342 this patch: 1342
netdev/cc_maintainers success CCed 7 of 7 maintainers
netdev/build_clang success Errors and warnings before: 1363 this patch: 1363
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn success Errors and warnings before: 1365 this patch: 1365
netdev/checkpatch warning WARNING: Possible repeated word: 'Google'
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Shigeru Yoshida Sept. 23, 2023, 5:35 p.m. UTC 
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(-)

Comments

Simon Horman Sept. 28, 2023, 1:11 p.m. UTC | #1 
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>
patchwork-bot+netdevbpf@kernel.org Oct. 3, 2023, 8:30 a.m. UTC | #2 
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!
diff mbox series

Patch

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;