| From 749090df2190a1d7f31c65fb0b7c30304b156cd8 Mon Sep 17 00:00:00 2001 |
| From: Kangjie Lu <kjlu@umn.edu> |
| Date: Tue, 12 Mar 2019 02:56:33 -0500 |
| Subject: rtlwifi: fix a potential NULL pointer dereference |
| |
| [ Upstream commit 765976285a8c8db3f0eb7f033829a899d0c2786e ] |
| |
| In case alloc_workqueue fails, the fix reports the error and |
| returns to avoid NULL pointer dereference. |
| |
| Signed-off-by: Kangjie Lu <kjlu@umn.edu> |
| Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/wireless/realtek/rtlwifi/base.c | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c |
| index 217d2a7a43c74..ac746c322554b 100644 |
| --- a/drivers/net/wireless/realtek/rtlwifi/base.c |
| +++ b/drivers/net/wireless/realtek/rtlwifi/base.c |
| @@ -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, |
| -- |
| 2.20.1 |
| |