Re: [PATCH 3/3] staging: r8712u: Fix case where ethtype was never obtained and always be checked against 0

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 04/09/2014 11:25 AM, Sergei Shtylyov wrote:
On 04/09/2014 08:13 PM, Larry Finger wrote:

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

Reported-by: Jes Sorensen <Jes.Sorensen@xxxxxxxxxx>
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Cc: Stable <stable@xxxxxxxxxxxxxxx>
---
  drivers/staging/rtl8712/rtl871x_recv.c | 15 +++++++--------
  1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/rtl8712/rtl871x_recv.c
b/drivers/staging/rtl8712/rtl871x_recv.c
index 23ec684..d8d1a76 100644
--- a/drivers/staging/rtl8712/rtl871x_recv.c
+++ b/drivers/staging/rtl8712/rtl871x_recv.c
[...]
@@ -262,16 +262,15 @@ union recv_frame *r8712_portctrl(struct _adapter *adapter,
      psta_addr = pfhdr->attrib.ta;
      psta = r8712_get_stainfo(pstapriv, psta_addr);
      auth_alg = adapter->securitypriv.AuthAlgrthm;
-    if (auth_alg == 2) {
+    if (auth_alg == dot11AuthAlgrthm_8021X) {
+        /* get ether_type */
+        ptr = ptr + pfhdr->attrib.hdrlen + LLC_HEADER_SIZE;

    Why not:

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

My comment is the same as the one I sent for patch 2.

Larry


--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]