Merge pull request #7 from kimocoder/v5.1.5

Security fix
This commit is contained in:
evilphish 2017-11-10 22:23:28 +01:00 committed by GitHub
commit 20b3c9cc7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3567,6 +3567,25 @@ void start_ap_mode(_adapter *padapter)
} }
void rtw_ap_bcmc_sta_flush(_adapter *padapter)
{
#ifdef CONFIG_CONCURRENT_MODE
int cam_id = -1;
u8 *addr = adapter_mac_addr(padapter);
cam_id = rtw_iface_bcmc_id_get(padapter);
if (cam_id != INVALID_SEC_MAC_CAM_ID) {
RTW_PRINT("clear group key for "ADPT_FMT" addr:"MAC_FMT", camid:%d\n",
ADPT_ARG(padapter), MAC_ARG(addr), cam_id);
clear_cam_entry(padapter, cam_id);
rtw_camid_free(padapter, cam_id);
rtw_iface_bcmc_id_set(padapter, INVALID_SEC_MAC_CAM_ID); /*init default value*/
}
#else
invalidate_cam_all(padapter);
#endif
}
void stop_ap_mode(_adapter *padapter) void stop_ap_mode(_adapter *padapter)
{ {
_irqL irqL; _irqL irqL;
@ -3599,6 +3618,7 @@ void stop_ap_mode(_adapter *padapter)
#endif #endif
rtw_sta_flush(padapter, _TRUE); rtw_sta_flush(padapter, _TRUE);
rtw_ap_bcmc_sta_flush(padapter);
/* free_assoc_sta_resources */ /* free_assoc_sta_resources */
rtw_free_all_stainfo(padapter); rtw_free_all_stainfo(padapter);