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

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

staging: r8712u: 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 9452bf56

drivers/staging/rtl8712/rtl871x_recv.c

+6 −7
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ union recv_frame *r8712_portctrl(struct _adapter *adapter, 
	struct sta_info *psta;

	struct	sta_priv *pstapriv;

	union recv_frame *prtnframe;

	u16 ether_type = 0;

	u16 ether_type;



	pstapriv = &adapter->stapriv;

	ptr = get_recvframe_data(precv_frame);
@@ -263,15 +263,14 @@ union recv_frame *r8712_portctrl(struct _adapter *adapter, 
	psta = r8712_get_stainfo(pstapriv, psta_addr);

	auth_alg = adapter->securitypriv.AuthAlgrthm;

	if (auth_alg == 2) {

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

			/* blocked

			 * only accept EAPOL frame */

			prtnframe = precv_frame;

		/* get ether_type */

			ptr = ptr + pfhdr->attrib.hdrlen +

			      pfhdr->attrib.iv_len + LLC_HEADER_SIZE;

		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 */

			if (ether_type == 0x888e)

				prtnframe = precv_frame;

			else {