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

Sergei Shtylyov sergei.shtylyov at cogentembedded.com
Wed Apr 9 16:25:50 UTC 2014


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 at redhat.com>
> Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
> Cc: Stable <stable at vger.kernel.org>
> ---
>   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;

WBR, Sergei



More information about the devel mailing list