Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 812650c6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

net: rtlwifi: properly check for alloc_workqueue() failure 

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c88c3326

drivers/net/wireless/realtek/rtlwifi/base.c

+10 −6
Original line number Original line Diff line number Diff line
@@ -454,9 +454,14 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw) 
	}

	}

}

}





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 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 */

	/* <1> timer */

	setup_timer(&rtlpriv->works.watchdog_timer,

	setup_timer(&rtlpriv->works.watchdog_timer,
@@ -465,7 +470,8 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw) 
		    rtl_easy_concurrent_retrytimer_callback, (unsigned long)hw);

		    rtl_easy_concurrent_retrytimer_callback, (unsigned long)hw);

	/* <2> work queue */

	/* <2> work queue */

	rtlpriv->works.hw = hw;

	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,

	INIT_DELAYED_WORK(&rtlpriv->works.watchdog_wq,

			  (void *)rtl_watchdog_wq_callback);

			  (void *)rtl_watchdog_wq_callback);

	INIT_DELAYED_WORK(&rtlpriv->works.ips_nic_off_wq,

	INIT_DELAYED_WORK(&rtlpriv->works.ips_nic_off_wq,
@@ -476,7 +482,7 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw) 
			  (void *)rtl_swlps_rfon_wq_callback);

			  (void *)rtl_swlps_rfon_wq_callback);

	INIT_DELAYED_WORK(&rtlpriv->works.fwevt_wq,

	INIT_DELAYED_WORK(&rtlpriv->works.fwevt_wq,

			  (void *)rtl_fwevt_wq_callback);

			  (void *)rtl_fwevt_wq_callback);



	return 0;

}

}





void rtl_deinit_deferred_work(struct ieee80211_hw *hw)

void rtl_deinit_deferred_work(struct ieee80211_hw *hw)
@@ -568,9 +574,7 @@ int rtl_init_core(struct ieee80211_hw *hw) 
	rtlmac->link_state = MAC80211_NOLINK;

	rtlmac->link_state = MAC80211_NOLINK;





	/* <6> init deferred work */

	/* <6> init deferred work */

	_rtl_init_deferred_work(hw);

	return _rtl_init_deferred_work(hw);



	return 0;

}

}

EXPORT_SYMBOL_GPL(rtl_init_core);

EXPORT_SYMBOL_GPL(rtl_init_core);