github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-28 18:21:24 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

wifi: mac80211: Fix overread in PREQ frame processing

Browse Source 
When the AF flag is enabled, hwmp_preq_frame_process() overreads
target_addr by 2 bytes. Since this occurs within the socket buffer, it does
not read across memory boundaries and therefore poses no security risk;
however, we will fix it as a precaution.

In this fix, a new function mesh_path_parse_request_frame() is established
to separate the implementation of frame format validation and the check for
unsupported features. This is intended to facilitate future work when
implementing the currently unsupported parts.

Assisted-by: Claude:Sonnet 4.6
Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
Link: https://patch.msgid.link/20260529230952.124754-4-masashi.honma@gmail.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Masashi Honma 2026-05-30 08:09:46 +09:00 committed by Johannes Berg
parent 68511e1632
commit 8b40b1d24a
3 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
include/linux/ieee80211-mesh.h
View File

@ -358,4 +358,33 @@ ieee80211_mesh_hwmp_perr_get_rcode(const u8 *ie, u8 dst_idx)
(dst->flags & AE_F) ? ETH_ALEN : 0]);
}
/* IEEE Std 802.11-2016 9.4.2.113 PREQ element */
static inline bool ieee80211_mesh_preq_size_ok(const u8 *pos, u8 elen)
{
struct ieee80211_mesh_hwmp_preq_bottom *preq_elem_bottom =
ieee80211_mesh_hwmp_preq_get_bottom(pos);
u8 target_count;
int needed;
/* Check if the element contains flags */
needed = sizeof(struct ieee80211_mesh_hwmp_preq_top);
if (elen < needed)
return false;
/* Check if the element contains target_count */
needed += (ieee80211_mesh_preq_prep_ae_enabled(pos) ? ETH_ALEN : 0)
/* Originator External Address */ +
sizeof(struct ieee80211_mesh_hwmp_preq_bottom);
if (elen < needed)
return false;
target_count = preq_elem_bottom->target_count;
/* IEEE Std 802.11-2016 Table 14-10 to 14-16 */
if (target_count < 1)
return false;
needed += target_count * sizeof(struct ieee80211_mesh_hwmp_preq_target);
return elen == needed;
}
#endif /* LINUX_IEEE80211_MESH_H */

12
net/mac80211/mesh_hwmp.c
View File

@ -929,9 +929,17 @@ void mesh_rx_path_sel_frame(struct ieee80211_sub_if_data *sdata,
return;
if (elems->preq) {
if (elems->preq_len != 37)
/* Right now we support just 1 destination and no AE */
struct ieee80211_mesh_hwmp_preq_bottom *preq_elem_bottom =
ieee80211_mesh_hwmp_preq_get_bottom(elems->preq);
/* Right now we do not support AE (Address Extension) */
if (ieee80211_mesh_preq_prep_ae_enabled(elems->preq))
goto free;
/* Right now we only support 1 target */
if (preq_elem_bottom->target_count != 1)
goto free;
path_metric = hwmp_route_info_get(sdata, mgmt, elems->preq,
MPATH_PREQ);
if (path_metric)

9
net/mac80211/parse.c
View File

@ -563,8 +563,13 @@ _ieee802_11_parse_elems_full(struct ieee80211_elems_parse_params *params,
elems->awake_window = (void *)pos;
break;
case WLAN_EID_PREQ:
elems->preq = pos;
elems->preq_len = elen;
if (ieee80211_mesh_preq_size_ok(pos, elen)) {
elems->preq = pos;
elems->preq_len = elen;
} else {
elem_parse_failed =
IEEE80211_PARSE_ERR_BAD_ELEM_SIZE;
}
break;
case WLAN_EID_PREP:
elems->prep = pos;