From d082d261fd36244a35fbcc691e0aa49cfbc2eae4 Mon Sep 17 00:00:00 2001 From: Naveen Rawat Date: Fri, 23 Mar 2018 17:10:01 -0700 Subject: qcacld-3.0: Fail channel sap channel change request for channel 0 In function wlansap_channel_change_request validate channel requested before processing the request. Change-Id: I1cc8c978b15fe6ee043ce6bf712a109994dce50b CRs-Fixed: 2212078 --- core/sap/src/sap_module.c | 6 ++++++ core/wma/src/wma_dev_if.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 9e5c0aadb253..2144cba81c50 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -2680,6 +2680,12 @@ wlansap_channel_change_request(void *pSapCtx, uint8_t target_channel) sapContext = (ptSapContext) pSapCtx; + if (!target_channel) { + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, + "%s: channel 0 requested", __func__); + return QDF_STATUS_E_FAULT; + } + if (NULL == sapContext) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer", __func__); diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 264badbba17a..e04a73e11760 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -2462,6 +2462,12 @@ QDF_STATUS wma_vdev_start(tp_wma_handle wma, return QDF_STATUS_E_FAILURE; } + if (req->chan == 0) { + WMA_LOGE("%s: invalid channel: %d", __func__, req->chan); + QDF_ASSERT(0); + return QDF_STATUS_E_INVAL; + } + params.band_center_freq1 = cds_chan_to_freq(req->chan); ch_width = req->chan_width; bw_val = cds_bw_value(ch_width); -- cgit v1.2.3