samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Förgrening 0
Kod Ärenden Pull-förfrågningar Actions Packages Projekt Släpp Wiki Aktiviteter

qcacld-3.0: Remove PTK/GTK debug logs

Bläddra i källkod 
qcacld-2.0 to qcacld-3.0 propagation

Currently host prints PTK and GTK key information in default logs.
Fix to remove the debug logs which prints sensitive key information.

Change-Id: I358b09b77d23eeb5da7d826859ae119a8ea4af8a
CRs-Fixed: 1097857
This commit is contained in:
Sreelakshmi Konamki
2017-02-28 17:29:43 +05:30
committad av qcabuildsw
förälder b53c629c0f
incheckning 66ddf3a759
3 ändrade filer med 2 tillägg och 73 borttagningar
Download Patch File Download Diff File Expand all files Collapse all files

39
core/mac/src/pe/lim/lim_ft.c
Visa fil

@@ -802,45 +802,6 @@ bool lim_process_ft_update_key(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
pAddBssParams->extSetStaKeyParam.sendRsp = false; pAddBssParams->extSetStaKeyParam.sendRsp = false;
if (pAddBssParams->extSetStaKeyParam.key[0].keyLength == 16) {
PELOG1(lim_log(pMac, LOG1,
FL
("BSS key = %02X-%02X-%02X-%02X-%02X-%02X-%02X- "
"%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X"),
pAddBssParams->extSetStaKeyParam.key[0].
key[0],
pAddBssParams->extSetStaKeyParam.key[0].
key[1],
pAddBssParams->extSetStaKeyParam.key[0].
key[2],
pAddBssParams->extSetStaKeyParam.key[0].
key[3],
pAddBssParams->extSetStaKeyParam.key[0].
key[4],
pAddBssParams->extSetStaKeyParam.key[0].
key[5],
pAddBssParams->extSetStaKeyParam.key[0].
key[6],
pAddBssParams->extSetStaKeyParam.key[0].
key[7],
pAddBssParams->extSetStaKeyParam.key[0].
key[8],
pAddBssParams->extSetStaKeyParam.key[0].
key[9],
pAddBssParams->extSetStaKeyParam.key[0].
key[10],
pAddBssParams->extSetStaKeyParam.key[0].
key[11],
pAddBssParams->extSetStaKeyParam.key[0].
key[12],
pAddBssParams->extSetStaKeyParam.key[0].
key[13],
pAddBssParams->extSetStaKeyParam.key[0].
key[14],
pAddBssParams->extSetStaKeyParam.key[0].
key[15]);
)
}
} }
return true; return true;
} }

28
core/sme/src/common/sme_ft_api.c
Visa fil

@@ -268,11 +268,8 @@ QDF_STATUS sme_ft_send_update_key_ind(tHalHandle hal, uint32_t session_id,
tSirKeyMaterial *keymaterial = NULL; tSirKeyMaterial *keymaterial = NULL;
tAniEdType ed_type; tAniEdType ed_type;
tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal);
int i = 0;
sms_log(mac_ctx, LOG1, FL("keyLength %d"), ftkey_info->keyLength); sms_log(mac_ctx, LOG1, FL("keyLength %d"), ftkey_info->keyLength);
for (i = 0; i < ftkey_info->keyLength; i++)
sms_log(mac_ctx, LOG1, FL("%02x"), ftkey_info->Key[i]);
if (ftkey_info->keyLength > CSR_MAX_KEY_LEN) { if (ftkey_info->keyLength > CSR_MAX_KEY_LEN) {
sms_log(mac_ctx, LOGE, FL("invalid keyLength %d"), sms_log(mac_ctx, LOGE, FL("invalid keyLength %d"),
@@ -302,32 +299,9 @@ QDF_STATUS sme_ft_send_update_key_ind(tHalHandle hal, uint32_t session_id,
keymaterial->key[0].paeRole = ftkey_info->paeRole; keymaterial->key[0].paeRole = ftkey_info->paeRole;
keymaterial->key[0].keyLength = ftkey_info->keyLength; keymaterial->key[0].keyLength = ftkey_info->keyLength;
if (ftkey_info->keyLength) { if (ftkey_info->keyLength)
qdf_mem_copy(&keymaterial->key[0].key, ftkey_info->Key, qdf_mem_copy(&keymaterial->key[0].key, ftkey_info->Key,
ftkey_info->keyLength); ftkey_info->keyLength);
if (ftkey_info->keyLength == 16) {
sms_log(mac_ctx, LOG1,
FL("set update ind keyidx(%d) encType(%d) key = %02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X"),
msg->keyMaterial.key[0].keyId,
(tAniEdType) msg->keyMaterial.edType,
msg->keyMaterial.key[0].key[0],
msg->keyMaterial.key[0].key[1],
msg->keyMaterial.key[0].key[2],
msg->keyMaterial.key[0].key[3],
msg->keyMaterial.key[0].key[4],
msg->keyMaterial.key[0].key[5],
msg->keyMaterial.key[0].key[6],
msg->keyMaterial.key[0].key[7],
msg->keyMaterial.key[0].key[8],
msg->keyMaterial.key[0].key[9],
msg->keyMaterial.key[0].key[10],
msg->keyMaterial.key[0].key[11],
msg->keyMaterial.key[0].key[12],
msg->keyMaterial.key[0].key[13],
msg->keyMaterial.key[0].key[14],
msg->keyMaterial.key[0].key[15]);
}
}
qdf_copy_macaddr(&msg->bssid, &ftkey_info->peerMac); qdf_copy_macaddr(&msg->bssid, &ftkey_info->peerMac);
msg->smeSessionId = session_id; msg->smeSessionId = session_id;

8
core/sme/src/csr/csr_api_roam.c
Visa fil

@@ -14936,15 +14936,9 @@ QDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac,
/* 0 is Supplicant */ /* 0 is Supplicant */
pMsg->keyMaterial.key[0].paeRole = paeRole; pMsg->keyMaterial.key[0].paeRole = paeRole;
pMsg->keyMaterial.key[0].keyLength = keyLength; pMsg->keyMaterial.key[0].keyLength = keyLength;
if (keyLength && pKey) { if (keyLength && pKey)
qdf_mem_copy(pMsg->keyMaterial.key[0].key, qdf_mem_copy(pMsg->keyMaterial.key[0].key,
pKey, keyLength); pKey, keyLength);
sms_log(pMac, LOG1,
FL("SME set keyIndx (%d) encType (%d) key"),
keyId, edType);
sir_dump_buf(pMac, SIR_SMS_MODULE_ID, LOG1, pKey,
keyLength);
}
status = umac_send_mb_message_to_mac(pMsg); status = umac_send_mb_message_to_mac(pMsg);
} while (0); } while (0);
return status; return status;