lkml.org 
[lkml]   [2014]   [May]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 33/86] staging: r8712u: Fix case where ethtype was never obtained and always be checked against 0
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Larry Finger <Larry.Finger@lwfinger.net>

    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 <Jes.Sorensen@redhat.com>
    Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    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
    @@ -254,7 +254,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);
    @@ -263,15 +263,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(&ether_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(&ether_type, ptr, 2);
    - ether_type = ntohs((unsigned short)ether_type);
    if (ether_type == 0x888e)
    prtnframe = precv_frame;
    else {



    \
     
     \ /
      Last update: 2014-05-04 19:41    [W:4.199 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site