lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 602/800] staging: rtl8712: Fix some tests against some data subtype frames
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit 116138c3bd34f92e550431d495db515f5ea19f13 ]

    Commit 6e2baa44c6d1 ("staging: rtl8712: remove enum WIFI_FRAME_SUBTYPE")
    was wrong because:
    WIFI_DATA_NULL != IEEE80211_STYPE_NULLFUNC
    WIFI_DATA_CFACK != IEEE80211_STYPE_DATA_CFACK
    WIFI_DATA_CFPOLL != IEEE80211_STYPE_DATA_CFPOLL
    WIFI_DATA_CFACKPOLL != IEEE80211_STYPE_DATA_CFACKPOLL

    the WIFI_DATA_xxx definitions include WIFI_DATA_TYPE, which is 'BIT(3)'.
    Restore the previous behavior by adding the missing
    'IEEE80211_FTYPE_DATA |' (0x0008, that is to say BIT(3)) when these values
    are used.

    Hopefully, the wrong commit was small enough and hand review is possible.

    Fixes: 6e2baa44c6d1 ("staging: rtl8712: remove enum WIFI_FRAME_SUBTYPE")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Link: https://lore.kernel.org/r/44aebfa3c5ce8f45ae05369c73e9ff77c6d271f9.1619939806.git.christophe.jaillet@wanadoo.fr
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/staging/rtl8712/rtl871x_recv.c | 2 +-
    drivers/staging/rtl8712/rtl871x_security.c | 12 ++++++------
    2 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/drivers/staging/rtl8712/rtl871x_recv.c b/drivers/staging/rtl8712/rtl871x_recv.c
    index db2add576418..c23f6b376111 100644
    --- a/drivers/staging/rtl8712/rtl871x_recv.c
    +++ b/drivers/staging/rtl8712/rtl871x_recv.c
    @@ -374,7 +374,7 @@ static sint ap2sta_data_frame(struct _adapter *adapter,
    if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) &&
    check_fwstate(pmlmepriv, _FW_LINKED)) {
    /* if NULL-frame, drop packet */
    - if ((GetFrameSubType(ptr)) == IEEE80211_STYPE_NULLFUNC)
    + if ((GetFrameSubType(ptr)) == (IEEE80211_FTYPE_DATA | IEEE80211_STYPE_NULLFUNC))
    return _FAIL;
    /* drop QoS-SubType Data, including QoS NULL,
    * excluding QoS-Data
    diff --git a/drivers/staging/rtl8712/rtl871x_security.c b/drivers/staging/rtl8712/rtl871x_security.c
    index 63d63f7be481..e0a1c30a8fe6 100644
    --- a/drivers/staging/rtl8712/rtl871x_security.c
    +++ b/drivers/staging/rtl8712/rtl871x_security.c
    @@ -1045,9 +1045,9 @@ static void aes_cipher(u8 *key, uint hdrlen,
    else
    a4_exists = 1;

    - if ((frtype == IEEE80211_STYPE_DATA_CFACK) ||
    - (frtype == IEEE80211_STYPE_DATA_CFPOLL) ||
    - (frtype == IEEE80211_STYPE_DATA_CFACKPOLL)) {
    + if ((frtype == (IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA_CFACK)) ||
    + (frtype == (IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA_CFPOLL)) ||
    + (frtype == (IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA_CFACKPOLL))) {
    qc_exists = 1;
    if (hdrlen != WLAN_HDR_A3_QOS_LEN)
    hdrlen += 2;
    @@ -1225,9 +1225,9 @@ static void aes_decipher(u8 *key, uint hdrlen,
    a4_exists = 0;
    else
    a4_exists = 1;
    - if ((frtype == IEEE80211_STYPE_DATA_CFACK) ||
    - (frtype == IEEE80211_STYPE_DATA_CFPOLL) ||
    - (frtype == IEEE80211_STYPE_DATA_CFACKPOLL)) {
    + if ((frtype == (IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA_CFACK)) ||
    + (frtype == (IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA_CFPOLL)) ||
    + (frtype == (IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA_CFACKPOLL))) {
    qc_exists = 1;
    if (hdrlen != WLAN_HDR_A3_QOS_LEN)
    hdrlen += 2;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 10:52    [W:4.064 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site