korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-14 15:54:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

wifi: ieee80211: Do not open-code qos address offsets

Browse Source 
When building with -Wstringop-overflow, GCC's KASAN implementation does
not correctly perform bounds checking within some complex structures
when faced with literal offsets, and can get very confused. For example,
this warning is seen due to literal offsets into sturct ieee80211_hdr
that may or may not be large enough:

drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c: In function 'iwl_mvm_rx_mpdu_mq':
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c:2022:29: warning: writing 1 byte into a region of size 0 [-Wstringop-overflow=]
 2022 |                         *qc &= ~IEEE80211_QOS_CTL_A_MSDU_PRESENT;
In file included from drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h:32,
                 from drivers/net/wireless/intel/iwlwifi/mvm/sta.h:15,
                 from drivers/net/wireless/intel/iwlwifi/mvm/mvm.h:27,
                 from drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c:10:
drivers/net/wireless/intel/iwlwifi/mvm/../fw/api/rx.h:559:16: note: at offset [78, 166] into destination object 'mpdu_len' of size 2
  559 |         __le16 mpdu_len;
      |                ^~~~~~~~

Refactor ieee80211_get_qos_ctl() to avoid using literal offsets,
requiring the creation of the actual structure that is described in the
comments. Explicitly choose the desired offset, making the code more
human-readable too. This is one of the last remaining warning to fix
before enabling -Wstringop-overflow globally.

Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=97490
Link: https://github.com/KSPP/linux/issues/181
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Kalle Valo <kvalo@kernel.org>
Cc: Gregory Greenman <gregory.greenman@intel.com>
Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Cc: linux-wireless@vger.kernel.org
Cc: netdev@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20221130212641.never.627-kees@kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Kees Cook 2022-11-30 13:26:45 -08:00 committed by Johannes Berg
parent 75ee07b03f
commit 278ab97931
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/linux/ieee80211.h
View File

@ -338,6 +338,17 @@ struct ieee80211_qos_hdr {
__le16 qos_ctrl; __le16 qos_ctrl;
} __packed __aligned(2); } __packed __aligned(2);
struct ieee80211_qos_hdr_4addr {
__le16 frame_control;
__le16 duration_id;
u8 addr1[ETH_ALEN];
u8 addr2[ETH_ALEN];
u8 addr3[ETH_ALEN];
__le16 seq_ctrl;
u8 addr4[ETH_ALEN];
__le16 qos_ctrl;
} __packed __aligned(2);
struct ieee80211_trigger { struct ieee80211_trigger {
__le16 frame_control; __le16 frame_control;
__le16 duration; __le16 duration;
@ -4060,16 +4071,21 @@ struct ieee80211_he_6ghz_capa {
* @hdr: the frame * @hdr: the frame
* *
* The qos ctrl bytes come after the frame_control, duration, seq_num * The qos ctrl bytes come after the frame_control, duration, seq_num
* and 3 or 4 addresses of length ETH_ALEN. * and 3 or 4 addresses of length ETH_ALEN. Checks frame_control to choose
* 3 addr: 2 + 2 + 2 + 3*6 = 24 * between struct ieee80211_qos_hdr_4addr and struct ieee80211_qos_hdr.
* 4 addr: 2 + 2 + 2 + 4*6 = 30
*/ */
static inline u8 *ieee80211_get_qos_ctl(struct ieee80211_hdr *hdr) static inline u8 *ieee80211_get_qos_ctl(struct ieee80211_hdr *hdr)
{ {
if (ieee80211_has_a4(hdr->frame_control)) union {
return (u8 *)hdr + 30; struct ieee80211_qos_hdr addr3;
struct ieee80211_qos_hdr_4addr addr4;
} *qos;
qos = (void *)hdr;
if (ieee80211_has_a4(qos->addr3.frame_control))
return (u8 *)&qos->addr4.qos_ctrl;
else else
return (u8 *)hdr + 24; return (u8 *)&qos->addr3.qos_ctrl;
} }
/** /**