| From 68c5634c4a7278672a3bed00eb5646884257c413 Mon Sep 17 00:00:00 2001 |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Date: Mon, 3 May 2021 13:56:39 +0200 |
| Subject: Revert "rtlwifi: fix a potential NULL pointer dereference" |
| |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| commit 68c5634c4a7278672a3bed00eb5646884257c413 upstream. |
| |
| This reverts commit 765976285a8c8db3f0eb7f033829a899d0c2786e. |
| |
| Because of recent interactions with developers from @umn.edu, all |
| commits from them have been recently re-reviewed to ensure if they were |
| correct or not. |
| |
| Upon review, this commit was found to be incorrect for the reasons |
| below, so it must be reverted. It will be fixed up "correctly" in a |
| later kernel change. |
| |
| This commit is not correct, it should not have used unlikely() and is |
| not propagating the error properly to the calling function, so it should |
| be reverted at this point in time. Also, if the check failed, the |
| work queue was still assumed to be allocated, so further accesses would |
| have continued to fail, meaning this patch does nothing to solve the |
| root issues at all. |
| |
| Cc: Kangjie Lu <kjlu@umn.edu> |
| Cc: Kalle Valo <kvalo@codeaurora.org> |
| Cc: Bryan Brattlof <hello@bryanbrattlof.com> |
| Fixes: 765976285a8c ("rtlwifi: fix a potential NULL pointer dereference") |
| Cc: stable <stable@vger.kernel.org> |
| Link: https://lore.kernel.org/r/20210503115736.2104747-13-gregkh@linuxfoundation.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/wireless/realtek/rtlwifi/base.c | 5 ----- |
| 1 file changed, 5 deletions(-) |
| |
| --- a/drivers/net/wireless/realtek/rtlwifi/base.c |
| +++ b/drivers/net/wireless/realtek/rtlwifi/base.c |
| @@ -466,11 +466,6 @@ static void _rtl_init_deferred_work(stru |
| /* <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, |