From 709c0cbcf2a8580006e2e9a13b109d469316e148 Mon Sep 17 00:00:00 2001 From: Naveen Rawat Date: Wed, 14 Mar 2018 17:04:15 -0700 Subject: [PATCH] qcacld-3.0: Avoid un-initialized pointer access in hdd_ndi_start_bss In function hdd_ndi_start_bss, avoid access to channel list pointer without initializing it. Change-Id: I9307f587bb9691d12b9b16f3a5e62945be7b2220 CRs-Fixed: 2205990 --- core/hdd/src/wlan_hdd_nan_datapath.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/core/hdd/src/wlan_hdd_nan_datapath.c b/core/hdd/src/wlan_hdd_nan_datapath.c index 5e40ba138d34..57f006ff4272 100644 --- a/core/hdd/src/wlan_hdd_nan_datapath.c +++ b/core/hdd/src/wlan_hdd_nan_datapath.c @@ -186,13 +186,11 @@ static int hdd_ndi_start_bss(struct hdd_adapter *adapter, roam_profile->csrPersona = adapter->device_mode; + if (!operating_channel) + operating_channel = NAN_SOCIAL_CHANNEL_2_4GHZ; + roam_profile->ChannelInfo.numOfChannels = 1; - if (operating_channel) { - roam_profile->ChannelInfo.ChannelList = &operating_channel; - } else { - roam_profile->ChannelInfo.ChannelList[0] = - NAN_SOCIAL_CHANNEL_2_4GHZ; - } + roam_profile->ChannelInfo.ChannelList = &operating_channel; roam_profile->SSIDs.numOfSSIDs = 1; roam_profile->SSIDs.SSIDList->SSID.length = 0;