Skip to contentSkip to conversation

net: rtlwifi: fix a potential NULL pointer dereference

PATCH In review Kangjie Lu 2 participants 4 messages Mar 12, 2019 – Apr 4, 2019

Subsystems (3)
lore
Share & tools
lore

Kangjie Lu

author
#0 lore raw

PATCH 1/1 net: rtlwifi: fix a potential NULL pointer dereference

In case alloc_workqueue fails, the fix reports the error and returns to avoid NULL pointer dereference.

---
 drivers/net/wireless/realtek/rtlwifi/base.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/net/wireless/realtek/rtlwifi/base.c +5 -0
index 217d2a7a43c7..ac746c322554 100644
@@ -448,6 +448,11 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw)
 	/* <2> work queue */
 	rtlpriv->works.hw = hw;
 	rtlpriv->works.rtl_wq = alloc_workqueue("%s", 0, 0, rtlpriv->cfg->name);
+	if (unlikely(!rtlpriv->works.rtl_wq)) {
+		pr_err("Failed to allocate work queue\n");
+		return;
+	}
+
 	INIT_DELAYED_WORK(&rtlpriv->works.watchdog_wq,
 			  (void *)rtl_watchdog_wq_callback);
 	INIT_DELAYED_WORK(&rtlpriv->works.ips_nic_off_wq,
Signature · 1 line
2.17.1
author
#1 lore raw
Quoted 17 lines · Kangjie Lu

In case alloc_workqueue fails, the fix reports the error and returns to avoid NULL pointer dereference.

---
drivers/net/wireless/realtek/rtlwifi/base.c | 5 +++++

1 file changed, 5 insertions(+)
drivers/net/wireless/realtek/rtlwifi/base.c +0 -0
index 217d2a7a43c7..ac746c322554 100644

drivers/net/wireless/realtek/rtlwifi/base.c static void _rtl_init_deferred_work(struct ieee80211_hw *hw) · line 455

Quoted 8 lines
drivers/net/wireless/realtek/rtlwifi/base.c +5 -0
@@ -448,6 +448,11 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw)
 	/* <2> work queue */
 	rtlpriv->works.hw = hw;
 	rtlpriv->works.rtl_wq = alloc_workqueue("%s", 0, 0, rtlpriv->cfg->name);
+	if (unlikely(!rtlpriv->works.rtl_wq)) {
+		pr_err("Failed to allocate work queue\n");
+		return;
+	}
+

Can someone review the patch?

Thanks.

Quoted 6 lines
drivers/net/wireless/realtek/rtlwifi/base.c +0 -0
 	INIT_DELAYED_WORK(&rtlpriv->works.watchdog_wq,
 			  (void *)rtl_watchdog_wq_callback);
 	INIT_DELAYED_WORK(&rtlpriv->works.ips_nic_off_wq,
Signature · 1 line
2.17.1
#2 lore raw
Quoted 10 lines · Kangjie Lu
Quoted 10 lines · Kangjie Lu

In case alloc_workqueue fails, the fix reports the error and returns to avoid NULL pointer dereference.

---
drivers/net/wireless/realtek/rtlwifi/base.c | 5 +++++

1 file changed, 5 insertions(+)
Quoted 16 lines
Quoted 6 lines
drivers/net/wireless/realtek/rtlwifi/base.c +0 -0
index 217d2a7a43c7..ac746c322554 100644

drivers/net/wireless/realtek/rtlwifi/base.c static void _rtl_init_deferred_work(struct ieee80211_hw *hw) · line 455

Quoted 8 lines
drivers/net/wireless/realtek/rtlwifi/base.c +5 -0
@@ -448,6 +448,11 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw)
 	/* <2> work queue */
 	rtlpriv->works.hw = hw;
 	rtlpriv->works.rtl_wq = alloc_workqueue("%s", 0, 0, rtlpriv->cfg->name);
+	if (unlikely(!rtlpriv->works.rtl_wq)) {
+		pr_err("Failed to allocate work queue\n");
+		return;
+	}
+

Can someone review the patch?

wireless-drivers-next is not yet open due to the wireless workshop. Also you can check the patch status yourself:

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

Signature · 1 line
Kalle Valo
#3 lore raw

Re: [PATCH] rtlwifi: fix a potential NULL pointer dereference

In reply to Kangjie Lu
Quoted 4 lines · Kangjie Lu

In case alloc_workqueue fails, the fix reports the error and returns to avoid NULL pointer dereference.

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

765976285a8c rtlwifi: fix a potential NULL pointer dereference

Signature · 3 lines
https://patchwork.kernel.org/patch/10848697/

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