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: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/staging/rtl8712/rtl871x_recv.c b/drivers/staging/rtl8712/rtl871x_recv.c
index 23ec684b60e1..274c359279ef 100644
--- a/drivers/staging/rtl8712/rtl871x_recv.c
+++ b/drivers/staging/rtl8712/rtl871x_recv.c
@@ -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) {
+                /* 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 */
-                        prtnframe = precv_frame;
-                        /*get ether_type */
-                        ptr = ptr + pfhdr->attrib.hdrlen +
-                              pfhdr->attrib.iv_len + LLC_HEADER_SIZE;
-                        memcpy(&ether_type, ptr, 2);
-                        ether_type = ntohs((unsigned short)ether_type);
                         if (ether_type == 0x888e)
                                 prtnframe = precv_frame;
                         else {