commit 02ff1ec4c800b043939409fa9233db35d7a068cd
author Bulbul Dabi <bdabi@codeaurora.org> Wed Apr 22 21:26:10 2015 +0530
committer Daniel Rosenberg <drosen@google.com> Wed Apr 22 18:15:38 2015 -0700
tree 5e94a2ecad297d54c96bbad3d9e465d9e36a6b4d
parent aec1eaea46ccee179357989409af13b20a795b11

prima: check for NULL pointer before accessing roc context

Bug: 20500889

Remain on channel context can be NULL in __wlan_hdd_mgmt_tx if
roc is not running already. So check for NULL before accessing
the roc context.

Change-Id: If1f7a1cf6b372882a078f54d0615d5a9bf7dc3ca
Signed-off-by: Bulbul Dabi <bdabi@codeaurora.org>

drivers/staging/prima/CORE/HDD/src/wlan_hdd_p2p.c

diff --git a/drivers/staging/prima/CORE/HDD/src/wlan_hdd_p2p.c b/drivers/staging/prima/CORE/HDD/src/wlan_hdd_p2p.c
index b3dc8d6..2a40d72 100644
--- a/drivers/staging/prima/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/drivers/staging/prima/CORE/HDD/src/wlan_hdd_p2p.c
@@ -1132,13 +1132,15 @@
     //then set the wait to 200 ms
     if (offchan && !wait)
     {
-        tANI_U32 current_time = vos_timer_get_system_time();
-        int remaining_roc_time = ((int) cfgState->remain_on_chan_ctx->duration -
-                                 (current_time - pAdapter->startRocTs));
-        if ( remaining_roc_time > ACTION_FRAME_DEFAULT_WAIT)
-            wait = remaining_roc_time;
-        else
-            wait = ACTION_FRAME_DEFAULT_WAIT;
+        wait = ACTION_FRAME_DEFAULT_WAIT;
+        if (pRemainChanCtx)
+        {
+            tANI_U32 current_time = vos_timer_get_system_time();
+            int remaining_roc_time = ((int) pRemainChanCtx->duration -
+                    (current_time - pAdapter->startRocTs));
+            if ( remaining_roc_time > ACTION_FRAME_DEFAULT_WAIT)
+                wait = remaining_roc_time;
+        }
     }
 
     //Call sme API to send out a action frame.