Ver Fonte

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
Naveen Rawat há 7 anos atrás
pai
commit
709c0cbcf2
1 ficheiros alterados com 4 adições e 6 exclusões
  1. 4 6
      core/hdd/src/wlan_hdd_nan_datapath.c

+ 4 - 6
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;