A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-15 01:01:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Fix incorrect NULL pointer check for HDD layer

Browse source 
Propagate from qcacld-2.0 to qcacld-3.0

Currently there are some places where array name is compared to NULL
in HDD. Add fix to correct it.

CRs-Fixed: 1063255
Change-Id: Ic8b6ce003a918890bae6d9c81f6732472333528e
This commit is contained in:
Yingying Tang 2016-10-20 17:00:37 +08:00 • committed by Prakash Dhavali
commit 3cc6b79f29
2 changed files with 10 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/hdd/src/wlan_hdd_scan.c
View file

@ -855,8 +855,9 @@ static int __iw_set_scan(struct net_device *dev, struct iw_request_info *info,
}
/* push addIEScan in scanRequset if exist */
if (pAdapter->scan_info.scanAddIE.addIEdata &&
pAdapter->scan_info.scanAddIE.length) {
if (pAdapter->scan_info.scanAddIE.length &&
pAdapter->scan_info.scanAddIE.length <=
sizeof(pAdapter->scan_info.scanAddIE.addIEdata)) {
scanRequest.uIEFieldLen = pAdapter->scan_info.scanAddIE.length;
scanRequest.pIEField = pAdapter->scan_info.scanAddIE.addIEdata;
}

24
core/hdd/src/wlan_hdd_wext.c
View file

@ -1625,7 +1625,6 @@ static void hdd_statistics_cb(void *pStats, void *pContext)
*/
void hdd_clear_roam_profile_ie(hdd_adapter_t *pAdapter)
{
int i = 0;
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
ENTER();
@ -1668,11 +1667,8 @@ void hdd_clear_roam_profile_ie(hdd_adapter_t *pAdapter)
pWextState->authKeyMgmt = 0;
for (i = 0; i < CSR_MAX_NUM_KEY; i++) {
if (pWextState->roamProfile.Keys.KeyMaterial[i]) {
pWextState->roamProfile.Keys.KeyLength[i] = 0;
}
}
qdf_mem_zero(pWextState->roamProfile.Keys.KeyLength, CSR_MAX_NUM_KEY);
#ifdef FEATURE_WLAN_WAPI
pAdapter->wapi_info.wapiAuthMode = WAPI_AUTH_MODE_OPEN;
pAdapter->wapi_info.nWapiMode = 0;
@ -3043,7 +3039,7 @@ static int __iw_get_encode(struct net_device *dev,
}
for (i = 0; i < MAX_WEP_KEYS; i++) {
if (pRoamProfile->Keys.KeyMaterial[i] == NULL) {
if (pRoamProfile->Keys.KeyLength[i] == 0) {
continue;
} else {
break;
@ -4057,7 +4053,6 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info,
uint8_t key_length;
eCsrEncryptionType encryptionType = eCSR_ENCRYPT_TYPE_NONE;
bool fKeyPresent = 0;
int i;
QDF_STATUS status = QDF_STATUS_SUCCESS;
int ret;
@ -4084,13 +4079,8 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info,
if (wrqu->data.flags & IW_ENCODE_DISABLED) {
hdd_notice("****iwconfig wlan0 key off*****");
if (!fKeyPresent) {
for (i = 0; i < CSR_MAX_NUM_KEY; i++) {
if (pWextState->roamProfile.Keys.KeyMaterial[i])
pWextState->roamProfile.Keys.
KeyLength[i] = 0;
}
qdf_mem_zero(pWextState->roamProfile.Keys.KeyLength,
CSR_MAX_NUM_KEY);
}
pHddStaCtx->conn_info.authType = eCSR_AUTH_TYPE_OPEN_SYSTEM;
pWextState->wpaVersion = IW_AUTH_WPA_VERSION_DISABLED;
@ -4270,7 +4260,7 @@ static int __iw_get_encodeext(struct net_device *dev,
}
for (i = 0; i < MAX_WEP_KEYS; i++) {
if (pRoamProfile->Keys.KeyMaterial[i] == NULL) {
if (pRoamProfile->Keys.KeyLength[i] == 0) {
continue;
} else {
break;
@ -4379,7 +4369,7 @@ static int __iw_set_encodeext(struct net_device *dev,
return -EINVAL;
} else {
/*Static wep, update the roam profile with the keys */
if (ext->key
if (ext->key_len
&& (ext->key_len <=
eCSR_SECURITY_WEP_KEYSIZE_MAX_BYTES)
&& key_index < CSR_MAX_NUM_KEY) {