linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] rtlwifi: rtl8192cu: fix error handle when usb probe failed
@ 2019-05-29  6:57 pkshih
  2019-05-29 14:51 ` Larry Finger
  2019-06-25  4:54 ` Kalle Valo
  0 siblings, 2 replies; 3+ messages in thread
From: pkshih @ 2019-05-29  6:57 UTC (permalink / raw)
  To: kvalo; +Cc: linux-wireless, andreyknvl, Larry.Finger

From: Ping-Ke Shih <pkshih@realtek.com>

rtl_usb_probe() must do error handle rtl_deinit_core() only if
rtl_init_core() is done, otherwise goto error_out2.

| usb 1-1: New USB device strings: Mfr=0, Product=0, SerialNumber=0
| rtl_usb: reg 0xf0, usbctrl_vendorreq TimeOut! status:0xffffffb9 value=0x0
| rtl8192cu: Chip version 0x10
| rtl_usb: reg 0xa, usbctrl_vendorreq TimeOut! status:0xffffffb9 value=0x0
| rtl_usb: Too few input end points found
| INFO: trying to register non-static key.
| the code is fine but needs lockdep annotation.
| turning off the locking correctness validator.
| CPU: 0 PID: 12 Comm: kworker/0:1 Not tainted 5.1.0-rc4-319354-g9a33b36 #3
| 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+0xe8/0x16e lib/dump_stack.c:113
|   assign_lock_key kernel/locking/lockdep.c:786 [inline]
|   register_lock_class+0x11b8/0x1250 kernel/locking/lockdep.c:1095
|   __lock_acquire+0xfb/0x37c0 kernel/locking/lockdep.c:3582
|   lock_acquire+0x10d/0x2f0 kernel/locking/lockdep.c:4211
|   __raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:110 [inline]
|   _raw_spin_lock_irqsave+0x44/0x60 kernel/locking/spinlock.c:152
|   rtl_c2hcmd_launcher+0xd1/0x390
| drivers/net/wireless/realtek/rtlwifi/base.c:2344
|   rtl_deinit_core+0x25/0x2d0 drivers/net/wireless/realtek/rtlwifi/base.c:574
|   rtl_usb_probe.cold+0x861/0xa70
| drivers/net/wireless/realtek/rtlwifi/usb.c:1093
|   usb_probe_interface+0x31d/0x820 drivers/usb/core/driver.c:361
|   really_probe+0x2da/0xb10 drivers/base/dd.c:509
|   driver_probe_device+0x21d/0x350 drivers/base/dd.c:671
|   __device_attach_driver+0x1d8/0x290 drivers/base/dd.c:778
|   bus_for_each_drv+0x163/0x1e0 drivers/base/bus.c:454
|   __device_attach+0x223/0x3a0 drivers/base/dd.c:844
|   bus_probe_device+0x1f1/0x2a0 drivers/base/bus.c:514
|   device_add+0xad2/0x16e0 drivers/base/core.c:2106
|   usb_set_configuration+0xdf7/0x1740 drivers/usb/core/message.c:2021
|   generic_probe+0xa2/0xda drivers/usb/core/generic.c:210
|   usb_probe_device+0xc0/0x150 drivers/usb/core/driver.c:266
|   really_probe+0x2da/0xb10 drivers/base/dd.c:509
|   driver_probe_device+0x21d/0x350 drivers/base/dd.c:671
|   __device_attach_driver+0x1d8/0x290 drivers/base/dd.c:778
|   bus_for_each_drv+0x163/0x1e0 drivers/base/bus.c:454
|   __device_attach+0x223/0x3a0 drivers/base/dd.c:844
|   bus_probe_device+0x1f1/0x2a0 drivers/base/bus.c:514
|   device_add+0xad2/0x16e0 drivers/base/core.c:2106
|   usb_new_device.cold+0x537/0xccf drivers/usb/core/hub.c:2534
|   hub_port_connect drivers/usb/core/hub.c:5089 [inline]
|   hub_port_connect_change drivers/usb/core/hub.c:5204 [inline]
|   port_event drivers/usb/core/hub.c:5350 [inline]
|   hub_event+0x138e/0x3b00 drivers/usb/core/hub.c:5432
|   process_one_work+0x90f/0x1580 kernel/workqueue.c:2269
|   worker_thread+0x9b/0xe20 kernel/workqueue.c:2415
|   kthread+0x313/0x420 kernel/kthread.c:253
|   ret_from_fork+0x3a/0x50 arch/x86/entry/entry_64.S:352

Reported-by: syzbot+1fcc5ef45175fc774231@syzkaller.appspotmail.com
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
 drivers/net/wireless/realtek/rtlwifi/usb.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtlwifi/usb.c b/drivers/net/wireless/realtek/rtlwifi/usb.c
index e24fda5e9087..34d68dbf4b4c 100644
--- a/drivers/net/wireless/realtek/rtlwifi/usb.c
+++ b/drivers/net/wireless/realtek/rtlwifi/usb.c
@@ -1064,13 +1064,13 @@ int rtl_usb_probe(struct usb_interface *intf,
 	rtlpriv->cfg->ops->read_eeprom_info(hw);
 	err = _rtl_usb_init(hw);
 	if (err)
-		goto error_out;
+		goto error_out2;
 	rtl_usb_init_sw(hw);
 	/* Init mac80211 sw */
 	err = rtl_init_core(hw);
 	if (err) {
 		pr_err("Can't allocate sw for mac80211\n");
-		goto error_out;
+		goto error_out2;
 	}
 	if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
 		pr_err("Can't init_sw_vars\n");
@@ -1091,6 +1091,7 @@ int rtl_usb_probe(struct usb_interface *intf,
 
 error_out:
 	rtl_deinit_core(hw);
+error_out2:
 	_rtl_usb_io_handler_release(hw);
 	usb_put_dev(udev);
 	complete(&rtlpriv->firmware_loading_complete);
-- 
2.21.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] rtlwifi: rtl8192cu: fix error handle when usb probe failed
  2019-05-29  6:57 [PATCH] rtlwifi: rtl8192cu: fix error handle when usb probe failed pkshih
@ 2019-05-29 14:51 ` Larry Finger
  2019-06-25  4:54 ` Kalle Valo
  1 sibling, 0 replies; 3+ messages in thread
From: Larry Finger @ 2019-05-29 14:51 UTC (permalink / raw)
  To: pkshih, kvalo; +Cc: linux-wireless, andreyknvl

On 5/29/19 1:57 AM, pkshih@realtek.com wrote:
> From: Ping-Ke Shih <pkshih@realtek.com>
> 
> rtl_usb_probe() must do error handle rtl_deinit_core() only if
> rtl_init_core() is done, otherwise goto error_out2.
> 
> | usb 1-1: New USB device strings: Mfr=0, Product=0, SerialNumber=0
> | rtl_usb: reg 0xf0, usbctrl_vendorreq TimeOut! status:0xffffffb9 value=0x0
> | rtl8192cu: Chip version 0x10
> | rtl_usb: reg 0xa, usbctrl_vendorreq TimeOut! status:0xffffffb9 value=0x0
> | rtl_usb: Too few input end points found
> | INFO: trying to register non-static key.
> | the code is fine but needs lockdep annotation.
> | turning off the locking correctness validator.
> | CPU: 0 PID: 12 Comm: kworker/0:1 Not tainted 5.1.0-rc4-319354-g9a33b36 #3
> | 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+0xe8/0x16e lib/dump_stack.c:113
> |   assign_lock_key kernel/locking/lockdep.c:786 [inline]
> |   register_lock_class+0x11b8/0x1250 kernel/locking/lockdep.c:1095
> |   __lock_acquire+0xfb/0x37c0 kernel/locking/lockdep.c:3582
> |   lock_acquire+0x10d/0x2f0 kernel/locking/lockdep.c:4211
> |   __raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:110 [inline]
> |   _raw_spin_lock_irqsave+0x44/0x60 kernel/locking/spinlock.c:152
> |   rtl_c2hcmd_launcher+0xd1/0x390
> | drivers/net/wireless/realtek/rtlwifi/base.c:2344
> |   rtl_deinit_core+0x25/0x2d0 drivers/net/wireless/realtek/rtlwifi/base.c:574
> |   rtl_usb_probe.cold+0x861/0xa70
> | drivers/net/wireless/realtek/rtlwifi/usb.c:1093
> |   usb_probe_interface+0x31d/0x820 drivers/usb/core/driver.c:361
> |   really_probe+0x2da/0xb10 drivers/base/dd.c:509
> |   driver_probe_device+0x21d/0x350 drivers/base/dd.c:671
> |   __device_attach_driver+0x1d8/0x290 drivers/base/dd.c:778
> |   bus_for_each_drv+0x163/0x1e0 drivers/base/bus.c:454
> |   __device_attach+0x223/0x3a0 drivers/base/dd.c:844
> |   bus_probe_device+0x1f1/0x2a0 drivers/base/bus.c:514
> |   device_add+0xad2/0x16e0 drivers/base/core.c:2106
> |   usb_set_configuration+0xdf7/0x1740 drivers/usb/core/message.c:2021
> |   generic_probe+0xa2/0xda drivers/usb/core/generic.c:210
> |   usb_probe_device+0xc0/0x150 drivers/usb/core/driver.c:266
> |   really_probe+0x2da/0xb10 drivers/base/dd.c:509
> |   driver_probe_device+0x21d/0x350 drivers/base/dd.c:671
> |   __device_attach_driver+0x1d8/0x290 drivers/base/dd.c:778
> |   bus_for_each_drv+0x163/0x1e0 drivers/base/bus.c:454
> |   __device_attach+0x223/0x3a0 drivers/base/dd.c:844
> |   bus_probe_device+0x1f1/0x2a0 drivers/base/bus.c:514
> |   device_add+0xad2/0x16e0 drivers/base/core.c:2106
> |   usb_new_device.cold+0x537/0xccf drivers/usb/core/hub.c:2534
> |   hub_port_connect drivers/usb/core/hub.c:5089 [inline]
> |   hub_port_connect_change drivers/usb/core/hub.c:5204 [inline]
> |   port_event drivers/usb/core/hub.c:5350 [inline]
> |   hub_event+0x138e/0x3b00 drivers/usb/core/hub.c:5432
> |   process_one_work+0x90f/0x1580 kernel/workqueue.c:2269
> |   worker_thread+0x9b/0xe20 kernel/workqueue.c:2415
> |   kthread+0x313/0x420 kernel/kthread.c:253
> |   ret_from_fork+0x3a/0x50 arch/x86/entry/entry_64.S:352
> 
> Reported-by: syzbot+1fcc5ef45175fc774231@syzkaller.appspotmail.com
> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>

I agree that this is a good fix.

Acked-by: Larry Finger <Larry.Finger@lwfinger.net>

Larry

> ---
>   drivers/net/wireless/realtek/rtlwifi/usb.c | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/wireless/realtek/rtlwifi/usb.c b/drivers/net/wireless/realtek/rtlwifi/usb.c
> index e24fda5e9087..34d68dbf4b4c 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/usb.c
> +++ b/drivers/net/wireless/realtek/rtlwifi/usb.c
> @@ -1064,13 +1064,13 @@ int rtl_usb_probe(struct usb_interface *intf,
>   	rtlpriv->cfg->ops->read_eeprom_info(hw);
>   	err = _rtl_usb_init(hw);
>   	if (err)
> -		goto error_out;
> +		goto error_out2;
>   	rtl_usb_init_sw(hw);
>   	/* Init mac80211 sw */
>   	err = rtl_init_core(hw);
>   	if (err) {
>   		pr_err("Can't allocate sw for mac80211\n");
> -		goto error_out;
> +		goto error_out2;
>   	}
>   	if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
>   		pr_err("Can't init_sw_vars\n");
> @@ -1091,6 +1091,7 @@ int rtl_usb_probe(struct usb_interface *intf,
>   
>   error_out:
>   	rtl_deinit_core(hw);
> +error_out2:
>   	_rtl_usb_io_handler_release(hw);
>   	usb_put_dev(udev);
>   	complete(&rtlpriv->firmware_loading_complete);
> 


^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH] rtlwifi: rtl8192cu: fix error handle when usb probe failed
  2019-05-29  6:57 [PATCH] rtlwifi: rtl8192cu: fix error handle when usb probe failed pkshih
  2019-05-29 14:51 ` Larry Finger
@ 2019-06-25  4:54 ` Kalle Valo
  1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2019-06-25  4:54 UTC (permalink / raw)
  To: pkshih; +Cc: linux-wireless, andreyknvl, Larry.Finger

<pkshih@realtek.com> wrote:

> From: Ping-Ke Shih <pkshih@realtek.com>
> 
> rtl_usb_probe() must do error handle rtl_deinit_core() only if
> rtl_init_core() is done, otherwise goto error_out2.
> 
> | usb 1-1: New USB device strings: Mfr=0, Product=0, SerialNumber=0
> | rtl_usb: reg 0xf0, usbctrl_vendorreq TimeOut! status:0xffffffb9 value=0x0
> | rtl8192cu: Chip version 0x10
> | rtl_usb: reg 0xa, usbctrl_vendorreq TimeOut! status:0xffffffb9 value=0x0
> | rtl_usb: Too few input end points found
> | INFO: trying to register non-static key.
> | the code is fine but needs lockdep annotation.
> | turning off the locking correctness validator.
> | CPU: 0 PID: 12 Comm: kworker/0:1 Not tainted 5.1.0-rc4-319354-g9a33b36 #3
> | 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+0xe8/0x16e lib/dump_stack.c:113
> |   assign_lock_key kernel/locking/lockdep.c:786 [inline]
> |   register_lock_class+0x11b8/0x1250 kernel/locking/lockdep.c:1095
> |   __lock_acquire+0xfb/0x37c0 kernel/locking/lockdep.c:3582
> |   lock_acquire+0x10d/0x2f0 kernel/locking/lockdep.c:4211
> |   __raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:110 [inline]
> |   _raw_spin_lock_irqsave+0x44/0x60 kernel/locking/spinlock.c:152
> |   rtl_c2hcmd_launcher+0xd1/0x390
> | drivers/net/wireless/realtek/rtlwifi/base.c:2344
> |   rtl_deinit_core+0x25/0x2d0 drivers/net/wireless/realtek/rtlwifi/base.c:574
> |   rtl_usb_probe.cold+0x861/0xa70
> | drivers/net/wireless/realtek/rtlwifi/usb.c:1093
> |   usb_probe_interface+0x31d/0x820 drivers/usb/core/driver.c:361
> |   really_probe+0x2da/0xb10 drivers/base/dd.c:509
> |   driver_probe_device+0x21d/0x350 drivers/base/dd.c:671
> |   __device_attach_driver+0x1d8/0x290 drivers/base/dd.c:778
> |   bus_for_each_drv+0x163/0x1e0 drivers/base/bus.c:454
> |   __device_attach+0x223/0x3a0 drivers/base/dd.c:844
> |   bus_probe_device+0x1f1/0x2a0 drivers/base/bus.c:514
> |   device_add+0xad2/0x16e0 drivers/base/core.c:2106
> |   usb_set_configuration+0xdf7/0x1740 drivers/usb/core/message.c:2021
> |   generic_probe+0xa2/0xda drivers/usb/core/generic.c:210
> |   usb_probe_device+0xc0/0x150 drivers/usb/core/driver.c:266
> |   really_probe+0x2da/0xb10 drivers/base/dd.c:509
> |   driver_probe_device+0x21d/0x350 drivers/base/dd.c:671
> |   __device_attach_driver+0x1d8/0x290 drivers/base/dd.c:778
> |   bus_for_each_drv+0x163/0x1e0 drivers/base/bus.c:454
> |   __device_attach+0x223/0x3a0 drivers/base/dd.c:844
> |   bus_probe_device+0x1f1/0x2a0 drivers/base/bus.c:514
> |   device_add+0xad2/0x16e0 drivers/base/core.c:2106
> |   usb_new_device.cold+0x537/0xccf drivers/usb/core/hub.c:2534
> |   hub_port_connect drivers/usb/core/hub.c:5089 [inline]
> |   hub_port_connect_change drivers/usb/core/hub.c:5204 [inline]
> |   port_event drivers/usb/core/hub.c:5350 [inline]
> |   hub_event+0x138e/0x3b00 drivers/usb/core/hub.c:5432
> |   process_one_work+0x90f/0x1580 kernel/workqueue.c:2269
> |   worker_thread+0x9b/0xe20 kernel/workqueue.c:2415
> |   kthread+0x313/0x420 kernel/kthread.c:253
> |   ret_from_fork+0x3a/0x50 arch/x86/entry/entry_64.S:352
> 
> Reported-by: syzbot+1fcc5ef45175fc774231@syzkaller.appspotmail.com
> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
> Acked-by: Larry Finger <Larry.Finger@lwfinger.net>

Patch applied to wireless-drivers-next.git, thanks.

6c0ed66f1a5b rtlwifi: rtl8192cu: fix error handle when usb probe failed

-- 
https://patchwork.kernel.org/patch/10966133/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-06-25  4:54 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-29  6:57 [PATCH] rtlwifi: rtl8192cu: fix error handle when usb probe failed pkshih
2019-05-29 14:51 ` Larry Finger
2019-06-25  4:54 ` Kalle Valo

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).