lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Larry Finger
2014-04-16 14:49:33 -05:00
committed by Greg Kroah-Hartman
parent 9452bf5602
commit f764cd68d9
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/rtl8712/rtl871x_recv.c
View File

@@ -254,7 +254,7 @@ union recv_frame *r8712_portctrl(struct _adapter *adapter,
struct sta_info *psta; struct sta_info *psta;
struct sta_priv *pstapriv; struct sta_priv *pstapriv;
union recv_frame *prtnframe; union recv_frame *prtnframe;
u16 ether_type = 0; u16 ether_type;
pstapriv = &adapter->stapriv; pstapriv = &adapter->stapriv;
ptr = get_recvframe_data(precv_frame); 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); psta = r8712_get_stainfo(pstapriv, psta_addr);
auth_alg = adapter->securitypriv.AuthAlgrthm; auth_alg = adapter->securitypriv.AuthAlgrthm;
if (auth_alg == 2) { 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)) { if ((psta != NULL) && (psta->ieee8021x_blocked)) {
/* blocked /* blocked
* only accept EAPOL frame */ * 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) if (ether_type == 0x888e)
prtnframe = precv_frame; prtnframe = precv_frame;
else { else {