diff mbox series

[lvc-project] wifi: mac80211: fix buffer overflow in ieee80211_rx_get_bigtk()

Message ID 20231004143740.40933-1-Igor.A.Artemiev@mcst.ru
State New
Headers show
Series [lvc-project] wifi: mac80211: fix buffer overflow in ieee80211_rx_get_bigtk() | expand

Commit Message

Igor Artemiev Oct. 4, 2023, 2:37 p.m. UTC
If 'idx' is 0, then 'idx2' is -1, and arrays 
will be accessed by a negative index. 

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Signed-off-by: Igor Artemiev <Igor.A.Artemiev@mcst.ru>
---
 net/mac80211/rx.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index e751cda5eef6..e686380434bd 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1868,10 +1868,13 @@  ieee80211_rx_get_bigtk(struct ieee80211_rx_data *rx, int idx)
 		key = rcu_dereference(rx->link_sta->gtk[idx]);
 	if (!key)
 		key = rcu_dereference(rx->link->gtk[idx]);
-	if (!key && rx->link_sta)
-		key = rcu_dereference(rx->link_sta->gtk[idx2]);
-	if (!key)
-		key = rcu_dereference(rx->link->gtk[idx2]);
+
+	if (idx2 >= 0) {
+		if (!key && rx->link_sta)
+			key = rcu_dereference(rx->link_sta->gtk[idx2]);
+		if (!key)
+			key = rcu_dereference(rx->link->gtk[idx2]);
+	}
 
 	return key;
 }