Skip to contentSkip to conversation

rtlwifi: Fix potential overflow on P2P code

PATCH In review [email protected] 2 participants 2 messages Nov 5, 2019 – Dec 17, 2019 Stable branch

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rtlwifi: Fix potential overflow on P2P code

From: Laura Abbott <[email protected]>

commit 8c55dedb795be8ec0cf488f98c03a1c2176f7fb1 upstream.

Nicolas Waisman noticed that even though noa_len is checked for a compatible length it's still possible to overrun the buffers of p2pinfo since there's no check on the upper bound of noa_num. Bound noa_num against P2P_MAX_NOA_NUM.

---
This fix is applied to most of stable kernel excepting to 3.16 due to directory change on kernel 4.4. So, I compose this patch with old directory for stable kernel 3.16.

---
 drivers/net/wireless/rtlwifi/ps.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/net/wireless/rtlwifi/ps.c +6 -0
index 50504942ded1..bfe097b224ad 100644
@@ -801,6 +801,9 @@ 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 ==
@@ -895,6 +898,9 @@ 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 ==
Signature · 1 line
2.21.0
#1 lore raw
Quoted 9 lines · On Tue, 2019-11-05 at 14:08 +0800, [email protected] wrote:

From: Laura Abbott <[email protected]>

commit 8c55dedb795be8ec0cf488f98c03a1c2176f7fb1 upstream.

Nicolas Waisman noticed that even though noa_len is checked for a compatible length it's still possible to overrun the buffers of p2pinfo since there's no check on the upper bound of noa_num. Bound noa_num against P2P_MAX_NOA_NUM.

Quoted 8 lines

---
This fix is applied to most of stable kernel excepting to 3.16 due to directory change on kernel 4.4. So, I compose this patch with old directory for stable kernel 3.16.

Thanks for this. I actually got round to backporting this myself before seeing your mail, so this ended up 3.16.77.

Ben.

Quoted 28 lines
---
 drivers/net/wireless/rtlwifi/ps.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/net/wireless/rtlwifi/ps.c +6 -0
index 50504942ded1..bfe097b224ad 100644
@@ -801,6 +801,9 @@ 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 ==
@@ -895,6 +898,9 @@ 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 ==
Signature · 2 lines
Ben Hutchings
If the facts do not conform to your theory, they must be disposed of.