| From 30b0e0ee9d02b97b68705c46b41444786effc40c Mon Sep 17 00:00:00 2001 |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Date: Mon, 3 May 2021 13:56:40 +0200 |
| Subject: net: rtlwifi: properly check for alloc_workqueue() failure |
| |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| commit 30b0e0ee9d02b97b68705c46b41444786effc40c upstream. |
| |
| If alloc_workqueue() fails, properly catch this and propagate the error |
| to the calling functions, so that the devuce initialization will |
| properly error out. |
| |
| Cc: Kalle Valo <kvalo@codeaurora.org> |
| Cc: Bryan Brattlof <hello@bryanbrattlof.com> |
| Cc: stable <stable@vger.kernel.org> |
| Link: https://lore.kernel.org/r/20210503115736.2104747-14-gregkh@linuxfoundation.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/wireless/realtek/rtlwifi/base.c | 15 ++++++++++----- |
| 1 file changed, 10 insertions(+), 5 deletions(-) |
| |
| --- a/drivers/net/wireless/realtek/rtlwifi/base.c |
| +++ b/drivers/net/wireless/realtek/rtlwifi/base.c |
| @@ -436,9 +436,14 @@ static void _rtl_init_mac80211(struct ie |
| } |
| } |
| |
| -static void _rtl_init_deferred_work(struct ieee80211_hw *hw) |
| +static int _rtl_init_deferred_work(struct ieee80211_hw *hw) |
| { |
| struct rtl_priv *rtlpriv = rtl_priv(hw); |
| + struct workqueue_struct *wq; |
| + |
| + wq = alloc_workqueue("%s", 0, 0, rtlpriv->cfg->name); |
| + if (!wq) |
| + return -ENOMEM; |
| |
| /* <1> timer */ |
| timer_setup(&rtlpriv->works.watchdog_timer, |
| @@ -447,7 +452,8 @@ static void _rtl_init_deferred_work(stru |
| rtl_easy_concurrent_retrytimer_callback, 0); |
| /* <2> work queue */ |
| rtlpriv->works.hw = hw; |
| - rtlpriv->works.rtl_wq = alloc_workqueue("%s", 0, 0, rtlpriv->cfg->name); |
| + rtlpriv->works.rtl_wq = wq; |
| + |
| INIT_DELAYED_WORK(&rtlpriv->works.watchdog_wq, |
| (void *)rtl_watchdog_wq_callback); |
| INIT_DELAYED_WORK(&rtlpriv->works.ips_nic_off_wq, |
| @@ -460,6 +466,7 @@ static void _rtl_init_deferred_work(stru |
| (void *)rtl_fwevt_wq_callback); |
| INIT_DELAYED_WORK(&rtlpriv->works.c2hcmd_wq, |
| (void *)rtl_c2hcmd_wq_callback); |
| + return 0; |
| } |
| |
| void rtl_deinit_deferred_work(struct ieee80211_hw *hw, bool ips_wq) |
| @@ -559,9 +566,7 @@ int rtl_init_core(struct ieee80211_hw *h |
| rtlmac->link_state = MAC80211_NOLINK; |
| |
| /* <6> init deferred work */ |
| - _rtl_init_deferred_work(hw); |
| - |
| - return 0; |
| + return _rtl_init_deferred_work(hw); |
| } |
| EXPORT_SYMBOL_GPL(rtl_init_core); |
| |