Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33c84bc1 authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: Fix case where ethtype was never obtained and always be checked against 0 



Zero-initializing ether_type masked that the ether type would never be
obtained for 8021x packets and the comparison against eapol_type
would always fail.

Reported-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f764cd68

drivers/staging/rtl8188eu/core/rtw_recv.c

+6 −9
Original line number Diff line number Diff line
@@ -551,10 +551,9 @@ static struct recv_frame *portctrl(struct adapter *adapter, 
	struct sta_info *psta;

	struct sta_priv *pstapriv;

	struct recv_frame *prtnframe;

	u16	ether_type = 0;

	u16	ether_type;

	u16  eapol_type = 0x888e;/* for Funia BD's WPA issue */

	struct rx_pkt_attrib *pattrib;

	__be16 be_tmp;





	pstapriv = &adapter->stapriv;
@@ -572,18 +571,16 @@ static struct recv_frame *portctrl(struct adapter *adapter, 
	RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("########portctrl:adapter->securitypriv.dot11AuthAlgrthm=%d\n", adapter->securitypriv.dot11AuthAlgrthm));



	if (auth_alg == 2) {

		/* get ether_type */

		ptr = ptr + pfhdr->attrib.hdrlen + LLC_HEADER_SIZE;

		memcpy(&ether_type, ptr, 2);

		ether_type = ntohs((unsigned short)ether_type);



		if ((psta != NULL) && (psta->ieee8021x_blocked)) {

			/* blocked */

			/* only accept EAPOL frame */

			RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("########portctrl:psta->ieee8021x_blocked==1\n"));



			prtnframe = precv_frame;



			/* get ether_type */

			ptr = ptr+pfhdr->attrib.hdrlen+pfhdr->attrib.iv_len+LLC_HEADER_SIZE;

			memcpy(&be_tmp, ptr, 2);

			ether_type = ntohs(be_tmp);



			if (ether_type == eapol_type) {

				prtnframe = precv_frame;

			} else {