From 4273799f0f419dc784be64b73952e23cec913cdd Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 30 Apr 2014 17:26:29 -0700 Subject: [PATCH] 3.4-stable patches added patches: staging-r8712u-fix-case-where-ethtype-was-never-obtained-and-always-be-checked-against-0.patch --- queue-3.4/series | 1 + ...ined-and-always-be-checked-against-0.patch | 53 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 queue-3.4/staging-r8712u-fix-case-where-ethtype-was-never-obtained-and-always-be-checked-against-0.patch diff --git a/queue-3.4/series b/queue-3.4/series index 09098e7c377..e0668df39cb 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -11,3 +11,4 @@ mfd-max8998-fix-possible-null-pointer-dereference-on-i2c_new_dummy-error.patch mfd-max8997-fix-possible-null-pointer-dereference-on-i2c_new_dummy-error.patch w1-fix-w1_send_slave-dropping-a-slave-id.patch staging-serqt_usb2-fix-sparse-warning-restricted-__le16-degrades-to-integer.patch +staging-r8712u-fix-case-where-ethtype-was-never-obtained-and-always-be-checked-against-0.patch diff --git a/queue-3.4/staging-r8712u-fix-case-where-ethtype-was-never-obtained-and-always-be-checked-against-0.patch b/queue-3.4/staging-r8712u-fix-case-where-ethtype-was-never-obtained-and-always-be-checked-against-0.patch new file mode 100644 index 00000000000..05486fb084e --- /dev/null +++ b/queue-3.4/staging-r8712u-fix-case-where-ethtype-was-never-obtained-and-always-be-checked-against-0.patch @@ -0,0 +1,53 @@ +From f764cd68d9036498f08fe8834deb6a367b5c2542 Mon Sep 17 00:00:00 2001 +From: Larry Finger +Date: Wed, 16 Apr 2014 14:49:33 -0500 +Subject: staging: r8712u: Fix case where ethtype was never obtained and always be checked against 0 + +From: Larry Finger + +commit f764cd68d9036498f08fe8834deb6a367b5c2542 upstream. + +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 +Signed-off-by: Larry Finger +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/staging/rtl8712/rtl871x_recv.c | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +--- a/drivers/staging/rtl8712/rtl871x_recv.c ++++ b/drivers/staging/rtl8712/rtl871x_recv.c +@@ -253,7 +253,7 @@ union recv_frame *r8712_portctrl(struct + 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); +@@ -262,15 +262,14 @@ union recv_frame *r8712_portctrl(struct + 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(ðer_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(ðer_type, ptr, 2); +- ether_type = ntohs((unsigned short)ether_type); + if (ether_type == 0x888e) + prtnframe = precv_frame; + else { -- 2.47.3