From b656e027b32a5ef5846eb475515b2cd7c6cfa664 Mon Sep 17 00:00:00 2001 From: Liangwei Dong Date: Fri, 28 May 2021 17:22:18 +0800 Subject: [PATCH] qcacld-3.0: Validate mac context in CSA bw selection API Add sanity check mac context before using it in API wlansap_get_csa_chanwidth_from_phymode. Change-Id: I8df501e850b606615c899321fc23636ad985ab23 CRs-Fixed: 2955278 --- core/sap/src/sap_module.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 186b32745159..49f1894ee807 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -1232,9 +1232,15 @@ wlansap_get_csa_chanwidth_from_phymode(struct sap_context *sap_context, struct ch_params *tgt_ch_params) { enum phy_ch_width ch_width, concurrent_bw = 0; - struct mac_context *mac = sap_get_mac_context(); + struct mac_context *mac; struct ch_params ch_params = {0}; + mac = sap_get_mac_context(); + if (!mac) { + sap_err("Invalid MAC context"); + return CH_WIDTH_20MHZ; + } + if (WLAN_REG_IS_24GHZ_CH_FREQ(chan_freq)) { /* * currently OBSS scan is done in hostapd, so to avoid