From mboxrd@z Thu Jan 1 00:00:00 1970 From: Larry Finger Subject: Re: [PATCH 3/3] staging: r8712u: Fix case where ethtype was never obtained and always be checked against 0 Date: Wed, 09 Apr 2014 12:45:39 -0500 Message-ID: <53458743.70008@lwfinger.net> References: <1397059980-11942-1-git-send-email-Larry.Finger@lwfinger.net> <1397059980-11942-4-git-send-email-Larry.Finger@lwfinger.net> <5345748E.7050908@cogentembedded.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Cc: devel@driverdev.osuosl.org, netdev@vger.kernel.org, Stable To: Sergei Shtylyov , gregkh@linuxfoundation.org Return-path: In-Reply-To: <5345748E.7050908@cogentembedded.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: driverdev-devel-bounces@linuxdriverproject.org List-Id: netdev.vger.kernel.org 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 >> Signed-off-by: Larry Finger >> Cc: Stable >> --- >> 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