staging: r8188eu: use ieee80211 define for version check
authorMartin Kaiser <martin@kaiser.cx>
Sun, 27 Mar 2022 18:09:36 +0000 (20:09 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 4 Apr 2022 05:33:46 +0000 (07:33 +0200)
Use the IEEE80211_FCTL_VERS define to check the version number
of a received frame.

Covert IEEE80211_FCTL_VERS to le16 before using it as a mask for fc,
which is also an le16 value. The ieee80211_... helper functions use
the same approach.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220327180944.712545-2-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/core/rtw_recv.c

index 8800ea4..fc7f2a5 100644 (file)
@@ -1063,7 +1063,6 @@ static int validate_recv_frame(struct adapter *adapter, struct recv_frame *precv
        struct rx_pkt_attrib *pattrib = &precv_frame->attrib;
        u8 *ptr = precv_frame->rx_data;
        __le16 fc = *(__le16 *)ptr;
-       u8  ver = (unsigned char)(*ptr) & 0x3;
        struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv;
 
        if (pmlmeext->sitesurvey_res.state == SCAN_PROCESS) {
@@ -1072,8 +1071,7 @@ static int validate_recv_frame(struct adapter *adapter, struct recv_frame *precv
                        pmlmeext->channel_set[ch_set_idx].rx_count++;
        }
 
-       /* add version chk */
-       if (ver != 0)
+       if ((fc & cpu_to_le16(IEEE80211_FCTL_VERS)) != 0)
                return _FAIL;
 
        pattrib->to_fr_ds = get_tofr_ds(ptr);