From 4e68c1c28db45ddc3bf97a9bd595ba7a959fa8a9 Mon Sep 17 00:00:00 2001
From: Gururaj Pandurangi <panduran@codeaurora.org>
Date: Wed, 5 Aug 2020 18:11:40 -0700
Subject: [PATCH] qcacld-3.0: Add sanity checks in csr macro

Add sanity checks in csr macro CSR_IS_SESSION_VALID
before dereferencing roam session id

Change-Id: Ia17b515c95ba72d03d075fbf881698a82d7eec47
CRs-Fixed: 2747938
---
 core/sme/inc/csr_internal.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h
index ff49f9f2c17a..da52dea16a76 100644
--- a/core/sme/inc/csr_internal.h
+++ b/core/sme/inc/csr_internal.h
@@ -42,6 +42,8 @@
 /* No of sessions to be supported, and a session is for Infra, BT-AMP */
 #define CSR_IS_SESSION_VALID(mac, sessionId) \
 	((sessionId) < WLAN_MAX_VDEVS && \
+	 (mac != NULL) && \
+	 ((mac)->roam.roamSession != NULL) && \
 	 (mac)->roam.roamSession[(sessionId)].sessionActive)
 
 #define CSR_GET_SESSION(mac, sessionId) \