commit ead6ae27777c13880ff3cfd42d71d946be61a2a4
author CNSS_WLAN Service <cnssbldsw@qualcomm.com> Fri Sep 06 00:16:24 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Sep 06 00:16:24 2019 -0700
tree 770ad00710bd973ba3d88bfb41177fd193e1e048
parent 8458a564983f5a397b29e56a22a2e490947a4ff5
parent 47b07a0704614ab2a1f9a043041ffc21bc7ee72a

Merge "wlan: Prevent potential race condition during adapter access" into wlan-driver.lnx.1.0

CORE/HDD/src/wlan_hdd_early_suspend.c

diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c
index f8f0da2..e68aa7a 100644
--- a/CORE/HDD/src/wlan_hdd_early_suspend.c
+++ b/CORE/HDD/src/wlan_hdd_early_suspend.c
@@ -1677,6 +1677,7 @@
            pAdapterNode = pNext;
            continue;
        }
+       dev_hold(pAdapter->dev);
        /* Avoid multiple enter/exit BMPS in this while loop using
         * hdd_enter_bmps flag
         */
@@ -1721,6 +1722,7 @@
                  __func__, ret);
        }
        status = hdd_get_next_adapter ( pHddCtx, pAdapterNode, &pNext );
+       dev_put(pAdapter->dev);
        pAdapterNode = pNext;
    }
 

CORE/HDD/src/wlan_hdd_p2p.c

diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index dfb9083..e3ab8b4 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -2547,6 +2547,7 @@
 {
 	wlan_hdd_release_intf_addr(hdd_ctx, adapter->macAddressCurrent.bytes);
 	hdd_stop_adapter(hdd_ctx, adapter, VOS_TRUE);
+	hdd_deinit_adapter(hdd_ctx, adapter, TRUE);
 	hdd_close_adapter(hdd_ctx, adapter, rtnl_held);
 }