net: rtlwifi: fix a potential NULL pointer dereference
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
@@ -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
Quoted 17 lines · Kangjie Lu
In case
alloc_workqueuefails, the fix reports the error and returns to avoid NULL pointer dereference.Signed-off-by Kangjie Lu <[email protected]>---
drivers/net/wireless/realtek/rtlwifi/base.c| 5 +++++1 file changed, 5 insertions(+)drivers/net/wireless/realtek/rtlwifi/base.c +0
-0
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
-0INIT_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
Quoted 10 lines · Kangjie Lu
Quoted 10 lines · Kangjie Lu
In case
alloc_workqueuefails, the fix reports the error and returns to avoid NULL pointer dereference.Signed-off-by Kangjie Lu <[email protected]>---
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
-0drivers/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:
Signature · 1 line
Kalle Valo
Re: [PATCH] rtlwifi: fix a potential NULL pointer dereference
In reply to Kangjie LuQuoted 4 lines · Kangjie Lu
In case
alloc_workqueuefails, the fix reports the error and returns to avoid NULL pointer dereference.Signed-off-by Kangjie Lu <[email protected]>
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