kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: rtl8723au: issue_beacon23a(): Do not copy IEs in front of beacon data

Browse source 
Not sure how this happened, but one should never copy the IEs in front
of the beacon frame info. This could lead to some nasty corrupted
beacon frames hitting the wire if running AP mode - ouf!

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2014-06-19 11:37:27 +02:00 • committed by Greg Kroah-Hartman
parent 0b46cfdd03
commit b81d36cbee
1 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

46
drivers/staging/rtl8723au/core/rtw_mlme_ext.c
View file

@ -2434,7 +2434,29 @@ void issue_beacon23a(struct rtw_adapter *padapter, int timeout_ms)
pframe += sizeof(struct ieee80211_hdr_3addr);
pattrib->pktlen = sizeof(struct ieee80211_hdr_3addr);
if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) {
/* below for ad-hoc mode */
/* timestamp will be inserted by hardware */
pframe += 8;
pattrib->pktlen += 8;
/* beacon interval: 2 bytes */
memcpy(pframe, (unsigned char *)
rtw_get_beacon_interval23a_from_ie(cur_network->IEs), 2);
pframe += 2;
pattrib->pktlen += 2;
/* capability info: 2 bytes */
memcpy(pframe, (unsigned char *)
rtw_get_capability23a_from_ie(cur_network->IEs), 2);
pframe += 2;
pattrib->pktlen += 2;
if ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE) {
u8 *iebuf;
int buflen;
/* DBG_8723A("ie len =%d\n", cur_network->IELength); */
@ -2468,28 +2490,6 @@ void issue_beacon23a(struct rtw_adapter *padapter, int timeout_ms)
goto _issue_bcn;
}
/* below for ad-hoc mode */
/* timestamp will be inserted by hardware */
pframe += 8;
pattrib->pktlen += 8;
/* beacon interval: 2 bytes */
memcpy(pframe, (unsigned char *)
rtw_get_beacon_interval23a_from_ie(cur_network->IEs), 2);
pframe += 2;
pattrib->pktlen += 2;
/* capability info: 2 bytes */
memcpy(pframe, (unsigned char *)
rtw_get_capability23a_from_ie(cur_network->IEs), 2);
pframe += 2;
pattrib->pktlen += 2;
/* SSID */
pframe = rtw_set_ie23a(pframe, WLAN_EID_SSID,
cur_network->Ssid.ssid_len,