Commit b81d36cb authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

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



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: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0b46cfdd

drivers/staging/rtl8723au/core/rtw_mlme_ext.c

+23 −23
Original line number Diff line number Diff line
@@ -2434,6 +2434,28 @@ void issue_beacon23a(struct rtw_adapter *padapter, int timeout_ms) 
	pframe += sizeof(struct ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct ieee80211_hdr_3addr);



	/* 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;
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE