This is a note to let you know that I've just added the patch titled
wifi: wilc1000: validate length of IEEE80211_P2P_ATTR_OPER_CHANNEL attribute
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
wifi-wilc1000-validate-length-of-ieee80211_p2p_attr_oper_channel-attribute.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 051ae669e4505abbe05165bebf6be7922de11f41 Mon Sep 17 00:00:00 2001
From: Phil Turnbull <philipturnbull@xxxxxxxxxx>
Date: Wed, 23 Nov 2022 10:35:41 -0500
Subject: wifi: wilc1000: validate length of IEEE80211_P2P_ATTR_OPER_CHANNEL attribute
From: Phil Turnbull <philipturnbull@xxxxxxxxxx>
commit 051ae669e4505abbe05165bebf6be7922de11f41 upstream.
Validate that the IEEE80211_P2P_ATTR_OPER_CHANNEL attribute contains
enough space for a 'struct struct wilc_attr_oper_ch'. If the attribute is
too small then it triggers an out-of-bounds write later in the function.
Signed-off-by: Phil Turnbull <philipturnbull@xxxxxxxxxx>
Tested-by: Ajay Kathat <ajay.kathat@xxxxxxxxxxxxx>
Acked-by: Ajay Kathat <ajay.kathat@xxxxxxxxxxxxx>
Signed-off-by: Kalle Valo <kvalo@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20221123153543.8568-3-philipturnbull@xxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/wireless/microchip/wilc1000/cfg80211.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
--- a/drivers/net/wireless/microchip/wilc1000/cfg80211.c
+++ b/drivers/net/wireless/microchip/wilc1000/cfg80211.c
@@ -939,14 +939,24 @@ static inline void wilc_wfi_cfg_parse_ch
return;
while (index + sizeof(*e) <= len) {
+ u16 attr_size;
+
e = (struct wilc_attr_entry *)&buf[index];
+ attr_size = le16_to_cpu(e->attr_len);
+
+ if (index + sizeof(*e) + attr_size > len)
+ return;
+
if (e->attr_type == IEEE80211_P2P_ATTR_CHANNEL_LIST)
ch_list_idx = index;
- else if (e->attr_type == IEEE80211_P2P_ATTR_OPER_CHANNEL)
+ else if (e->attr_type == IEEE80211_P2P_ATTR_OPER_CHANNEL &&
+ attr_size == (sizeof(struct wilc_attr_oper_ch) - sizeof(*e)))
op_ch_idx = index;
+
if (ch_list_idx && op_ch_idx)
break;
- index += le16_to_cpu(e->attr_len) + sizeof(*e);
+
+ index += sizeof(*e) + attr_size;
}
if (ch_list_idx) {
Patches currently in stable-queue which might be from philipturnbull@xxxxxxxxxx are
queue-5.15/wifi-wilc1000-validate-number-of-channels.patch
queue-5.15/wifi-wilc1000-validate-length-of-ieee80211_p2p_attr_channel_list-attribute.patch
queue-5.15/wifi-wilc1000-validate-length-of-ieee80211_p2p_attr_oper_channel-attribute.patch
queue-5.15/wifi-wilc1000-validate-pairwise-and-authentication-suite-offsets.patch
