Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: rtl8712: fix uninit-value in usb_read8() and friends

When r8712_usbctrl_vendorreq() returns negative, 'data' in
usb_read{8,16,32} will not be initialized.

BUG: KMSAN: uninit-value in string_nocheck lib/vsprintf.c:643 [inline]
BUG: KMSAN: uninit-value in string+0x4ec/0x6f0 lib/vsprintf.c:725
string_nocheck lib/vsprintf.c:643 [inline]
string+0x4ec/0x6f0 lib/vsprintf.c:725
vsnprintf+0x2222/0x3650 lib/vsprintf.c:2806
va_format lib/vsprintf.c:1704 [inline]
pointer+0x18e6/0x1f70 lib/vsprintf.c:2443
vsnprintf+0x1a9b/0x3650 lib/vsprintf.c:2810
vprintk_store+0x537/0x2150 kernel/printk/printk.c:2158
vprintk_emit+0x28b/0xab0 kernel/printk/printk.c:2256
dev_vprintk_emit+0x5ef/0x6d0 drivers/base/core.c:4604
dev_printk_emit+0x1dd/0x21f drivers/base/core.c:4615
__dev_printk+0x3be/0x440 drivers/base/core.c:4627
_dev_info+0x1ea/0x22f drivers/base/core.c:4673
r871xu_drv_init+0x1929/0x3070 drivers/staging/rtl8712/usb_intf.c:401
usb_probe_interface+0xf19/0x1600 drivers/usb/core/driver.c:396
really_probe+0x6c7/0x1350 drivers/base/dd.c:621
__driver_probe_device+0x3e9/0x530 drivers/base/dd.c:752
driver_probe_device drivers/base/dd.c:782 [inline]
__device_attach_driver+0x79f/0x1120 drivers/base/dd.c:899
bus_for_each_drv+0x2d6/0x3f0 drivers/base/bus.c:427
__device_attach+0x593/0x8e0 drivers/base/dd.c:970
device_initial_probe+0x4a/0x60 drivers/base/dd.c:1017
bus_probe_device+0x17b/0x3e0 drivers/base/bus.c:487
device_add+0x1fff/0x26e0 drivers/base/core.c:3405
usb_set_configuration+0x37e9/0x3ed0 drivers/usb/core/message.c:2170
usb_generic_driver_probe+0x13c/0x300 drivers/usb/core/generic.c:238
usb_probe_device+0x309/0x570 drivers/usb/core/driver.c:293
really_probe+0x6c7/0x1350 drivers/base/dd.c:621
__driver_probe_device+0x3e9/0x530 drivers/base/dd.c:752
driver_probe_device drivers/base/dd.c:782 [inline]
__device_attach_driver+0x79f/0x1120 drivers/base/dd.c:899
bus_for_each_drv+0x2d6/0x3f0 drivers/base/bus.c:427
__device_attach+0x593/0x8e0 drivers/base/dd.c:970
device_initial_probe+0x4a/0x60 drivers/base/dd.c:1017
bus_probe_device+0x17b/0x3e0 drivers/base/bus.c:487
device_add+0x1fff/0x26e0 drivers/base/core.c:3405
usb_new_device+0x1b91/0x2950 drivers/usb/core/hub.c:2566
hub_port_connect drivers/usb/core/hub.c:5363 [inline]
hub_port_connect_change drivers/usb/core/hub.c:5507 [inline]
port_event drivers/usb/core/hub.c:5665 [inline]
hub_event+0x58e3/0x89e0 drivers/usb/core/hub.c:5747
process_one_work+0xdb6/0x1820 kernel/workqueue.c:2289
worker_thread+0x10d0/0x2240 kernel/workqueue.c:2436
kthread+0x3c7/0x500 kernel/kthread.c:376
ret_from_fork+0x1f/0x30

Local variable data created at:
usb_read8+0x5d/0x130 drivers/staging/rtl8712/usb_ops.c:33
r8712_read8+0xa5/0xd0 drivers/staging/rtl8712/rtl8712_io.c:29

KMSAN: uninit-value in r871xu_drv_init
https://syzkaller.appspot.com/bug?id=3cd92b1d85428b128503bfa7a250294c9ae00bd8

Reported-by: <syzbot+6f5ecd144854c0d8580b@syzkaller.appspotmail.com>
Tested-by: <syzbot+6f5ecd144854c0d8580b@syzkaller.appspotmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Wang Cheng <wanngchenng@gmail.com>
Link: https://lore.kernel.org/r/b9b7a6ee02c02aa28054f5cf16129977775f3cd9.1652618244.git.wanngchenng@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Wang Cheng and committed by
Greg Kroah-Hartman
d1b57669 644ee3bf

+18 -9
+18 -9
drivers/staging/rtl8712/usb_ops.c
··· 29 29 u16 wvalue; 30 30 u16 index; 31 31 u16 len; 32 - __le32 data; 32 + int status; 33 + __le32 data = 0; 33 34 struct intf_priv *intfpriv = intfhdl->pintfpriv; 34 35 35 36 request = 0x05; ··· 38 37 index = 0; 39 38 wvalue = (u16)(addr & 0x0000ffff); 40 39 len = 1; 41 - r8712_usbctrl_vendorreq(intfpriv, request, wvalue, index, &data, len, 42 - requesttype); 40 + status = r8712_usbctrl_vendorreq(intfpriv, request, wvalue, index, 41 + &data, len, requesttype); 42 + if (status < 0) 43 + return 0; 43 44 return (u8)(le32_to_cpu(data) & 0x0ff); 44 45 } 45 46 ··· 52 49 u16 wvalue; 53 50 u16 index; 54 51 u16 len; 55 - __le32 data; 52 + int status; 53 + __le32 data = 0; 56 54 struct intf_priv *intfpriv = intfhdl->pintfpriv; 57 55 58 56 request = 0x05; ··· 61 57 index = 0; 62 58 wvalue = (u16)(addr & 0x0000ffff); 63 59 len = 2; 64 - r8712_usbctrl_vendorreq(intfpriv, request, wvalue, index, &data, len, 65 - requesttype); 60 + status = r8712_usbctrl_vendorreq(intfpriv, request, wvalue, index, 61 + &data, len, requesttype); 62 + if (status < 0) 63 + return 0; 66 64 return (u16)(le32_to_cpu(data) & 0xffff); 67 65 } 68 66 ··· 75 69 u16 wvalue; 76 70 u16 index; 77 71 u16 len; 78 - __le32 data; 72 + int status; 73 + __le32 data = 0; 79 74 struct intf_priv *intfpriv = intfhdl->pintfpriv; 80 75 81 76 request = 0x05; ··· 84 77 index = 0; 85 78 wvalue = (u16)(addr & 0x0000ffff); 86 79 len = 4; 87 - r8712_usbctrl_vendorreq(intfpriv, request, wvalue, index, &data, len, 88 - requesttype); 80 + status = r8712_usbctrl_vendorreq(intfpriv, request, wvalue, index, 81 + &data, len, requesttype); 82 + if (status < 0) 83 + return 0; 89 84 return le32_to_cpu(data); 90 85 } 91 86