Skip to content

Commit 0858206

Browse files
author
Paolo Abeni
committed
Johannes Berg says: ==================== Just one fix, for a parsing error in mac80211 that might result in a one byte out-of-bounds read. * tag 'wireless-2026-01-29' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless: wifi: mac80211: correctly decode TTLM with default link map ==================== Link: https://patch.msgid.link/20260129110403.178036-3-johannes@sipsolutions.net Signed-off-by: Paolo Abeni <pabeni@redhat.com>
2 parents df8b9be + 1eab33a commit 0858206

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

net/mac80211/mlme.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Copyright 2007, Michael Wu <flamingice@sourmilk.net>
99
* Copyright 2013-2014 Intel Mobile Communications GmbH
1010
* Copyright (C) 2015 - 2017 Intel Deutschland GmbH
11-
* Copyright (C) 2018 - 2025 Intel Corporation
11+
* Copyright (C) 2018 - 2026 Intel Corporation
1212
*/
1313

1414
#include <linux/delay.h>
@@ -6190,8 +6190,10 @@ ieee80211_parse_adv_t2l(struct ieee80211_sub_if_data *sdata,
61906190
return -EINVAL;
61916191
}
61926192

6193-
link_map_presence = *pos;
6194-
pos++;
6193+
if (!(control & IEEE80211_TTLM_CONTROL_DEF_LINK_MAP)) {
6194+
link_map_presence = *pos;
6195+
pos++;
6196+
}
61956197

61966198
if (control & IEEE80211_TTLM_CONTROL_SWITCH_TIME_PRESENT) {
61976199
ttlm_info->switch_time = get_unaligned_le16(pos);

0 commit comments

Comments
 (0)