From 1a7d05adc6eb5c0809b588220af9e750fe135fa4 Mon Sep 17 00:00:00 2001
From: Landry Norris <37489471+LandryNorris@users.noreply.github.com>
Date: Tue, 8 Apr 2025 13:59:55 -0500
Subject: [PATCH] Fix potential overflow in P2P code

Port of this commit: https://github.com/torvalds/linux/commit/8c55dedb795be8ec0cf488f98c03a1c2176f7fb1
---
 drivers/net/wireless/rtlwifi/ps.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c
index ace1a087f..c7d330823 100644
--- a/drivers/net/wireless/rtlwifi/ps.c
+++ b/drivers/net/wireless/rtlwifi/ps.c
@@ -698,6 +698,8 @@ static void rtl_p2p_noa_ie(struct ieee80211_hw *hw, void *data,
 				return;
 			} else {
 				noa_num = (noa_len - 2) / 13;
+				if (noa_num > P2P_MAX_NOA_NUM)
+				    noa_num = P2P_MAX_NOA_NUM;
 			}
 			noa_index = ie[3];
 			if (rtlpriv->psc.p2p_ps_info.p2p_ps_mode ==
@@ -792,6 +794,8 @@ static void rtl_p2p_action_ie(struct ieee80211_hw *hw, void *data,
 				return;
 			} else {
 				noa_num = (noa_len - 2) / 13;
+				if (noa_num > P2P_MAX_NOA_NUM)
+                                    noa_num = P2P_MAX_NOA_NUM;
 			}
 			noa_index = ie[3];
 			if (rtlpriv->psc.p2p_ps_info.p2p_ps_mode ==