wifi: rtw89: usb: Avoid crash with dynamically added device ID
PATCH v2 1/1 wifi: rtw89: usb: Avoid crash with dynamically added device ID
Adding a device ID via sysfs causes a crash when the device is plugged in, because the driver_info pointer is null.
Check for null driver_info in rtw89_usb_probe() and add a wrapper in each driver to pass it a reasonable default value.
---
v2:
- Simplify the wrappers, move the null check into rtw89_usb_probe().
--- drivers/net/wireless/realtek/rtw89/rtw8851bu.c | 8 +++++++- drivers/net/wireless/realtek/rtw89/rtw8852au.c | 8 +++++++- drivers/net/wireless/realtek/rtw89/rtw8852bu.c | 8 +++++++- drivers/net/wireless/realtek/rtw89/rtw8852cu.c | 8 +++++++- drivers/net/wireless/realtek/rtw89/rtw8922au.c | 8 +++++++- drivers/net/wireless/realtek/rtw89/usb.c | 5 ++++- drivers/net/wireless/realtek/rtw89/usb.h | 3 ++- 7 files changed, 41 insertions(+), 7 deletions(-)
drivers/net/wireless/realtek/rtw89/rtw8851bu.c +7 -1
@@ -59,10 +59,16 @@ static const struct usb_device_id rtw_8851bu_id_table[] = { };MODULE_DEVICE_TABLE (usb, rtw_8851bu_id_table); +static int rtw8851bu_probe (struct usb_interface *intf, +const struct usb_device_id *id) +{ +return rtw89_usb_probe (intf, id, &rtw89_8851bu_info); +} +static struct usb_driver rtw_8851bu_driver = { .name =KBUILD_MODNAME , .id_table = rtw_8851bu_id_table, - .probe = rtw89_usb_probe, + .probe = rtw8851bu_probe, .disconnect = rtw89_usb_disconnect, };module_usb_driver (rtw_8851bu_driver);
drivers/net/wireless/realtek/rtw89/rtw8852au.c +7 -1
@@ -73,10 +73,16 @@ static const struct usb_device_id rtw_8852au_id_table[] = { };MODULE_DEVICE_TABLE (usb, rtw_8852au_id_table); +static int rtw8852au_probe (struct usb_interface *intf, +const struct usb_device_id *id) +{ +return rtw89_usb_probe (intf, id, &rtw89_8852au_info); +} +static struct usb_driver rtw_8852au_driver = { .name =KBUILD_MODNAME , .id_table = rtw_8852au_id_table, - .probe = rtw89_usb_probe, + .probe = rtw8852au_probe, .disconnect = rtw89_usb_disconnect, };module_usb_driver (rtw_8852au_driver);
drivers/net/wireless/realtek/rtw89/rtw8852bu.c +7 -1
@@ -73,10 +73,16 @@ static const struct usb_device_id rtw_8852bu_id_table[] = { };MODULE_DEVICE_TABLE (usb, rtw_8852bu_id_table); +static int rtw8852bu_probe (struct usb_interface *intf, +const struct usb_device_id *id) +{ +return rtw89_usb_probe (intf, id, &rtw89_8852bu_info); +} +static struct usb_driver rtw_8852bu_driver = { .name =KBUILD_MODNAME , .id_table = rtw_8852bu_id_table, - .probe = rtw89_usb_probe, + .probe = rtw8852bu_probe, .disconnect = rtw89_usb_disconnect, };module_usb_driver (rtw_8852bu_driver);
drivers/net/wireless/realtek/rtw89/rtw8852cu.c +7 -1
@@ -133,10 +133,16 @@ static const struct usb_device_id rtw_8852cu_id_table[] = { };MODULE_DEVICE_TABLE (usb, rtw_8852cu_id_table); +static int rtw8852cu_probe (struct usb_interface *intf, +const struct usb_device_id *id) +{ +return rtw89_usb_probe (intf, id, &rtw89_8852cu_info); +} +static struct usb_driver rtw_8852cu_driver = { .name =KBUILD_MODNAME , .id_table = rtw_8852cu_id_table, - .probe = rtw89_usb_probe, + .probe = rtw8852cu_probe, .disconnect = rtw89_usb_disconnect, };module_usb_driver (rtw_8852cu_driver);
drivers/net/wireless/realtek/rtw89/rtw8922au.c +7 -1
@@ -74,10 +74,16 @@ static const struct usb_device_id rtw_8922au_id_table[] = { };MODULE_DEVICE_TABLE (usb, rtw_8922au_id_table); +static int rtw8922au_probe (struct usb_interface *intf, +const struct usb_device_id *id) +{ +return rtw89_usb_probe (intf, id, &rtw89_8922au_info); +} +static struct usb_driver rtw_8922au_driver = { .name =KBUILD_MODNAME , .id_table = rtw_8922au_id_table, - .probe = rtw89_usb_probe, + .probe = rtw8922au_probe, .disconnect = rtw89_usb_disconnect, };module_usb_driver (rtw_8922au_driver);
drivers/net/wireless/realtek/rtw89/usb.c +4 -1
@@ -1207,7 +1207,8 @@ static const struct attribute_group rtw89_usb_group = {__ATTRIBUTE_GROUPS (rtw89_usb);int rtw89_usb_probe (struct usb_interface *intf, -const struct usb_device_id *id) +const struct usb_device_id *id, +const struct rtw89_driver_info *default_info) {const struct rtw89_driver_info *info;struct rtw89_dev *rtwdev;
@@ -1215,6 +1216,8 @@ int rtw89_usb_probe(struct usb_interface *intf,int ret; info = (const struct rtw89_driver_info *)id->driver_info; +if (!info) + info = default_info; rtwdev =rtw89_alloc_ieee80211_hw (&intf->dev,sizeof (struct rtw89_usb ), info);
drivers/net/wireless/realtek/rtw89/usb.h +2 -1
@@ -95,7 +95,8 @@ static inline struct rtw89_usb *rtw89_usb_priv(struct rtw89_dev *rtwdev) }int rtw89_usb_probe (struct usb_interface *intf, -const struct usb_device_id *id); +const struct usb_device_id *id, +const struct rtw89_driver_info *default_info);void rtw89_usb_disconnect (struct usb_interface *intf);#endif
Signature · 1 line
2.55.0
Quoted 7 lines · Bitterblue Smith
Adding a device ID via sysfs causes a crash when the device is plugged in, because the
driver_infopointer is null.Check for null
driver_infoinrtw89_usb_probe()and add a wrapper in each driver to pass it a reasonable default value.Signed-off-by Bitterblue Smith <[email protected]>
Ping-Ke Shih
maintainerQuoted 8 lines · Bitterblue Smith
Adding a device ID via sysfs causes a crash when the device is plugged in, because the
driver_infopointer is null.Check for null
driver_infoinrtw89_usb_probe()and add a wrapper in each driver to pass it a reasonable default value.Signed-off-by Bitterblue Smith <[email protected]>Acked-by Ping-Ke Shih <[email protected]>
1 patch(es) applied to rtw-next branch of rtw.git, thanks.
b18272271768 wifi: rtw89: usb: Avoid crash with dynamically added device ID