Skip to contentSkip to conversation

rtlwifi: Fix potential overflow on P2P code

PATCH In review Laura Abbott 3 participants 7 messages Oct 18, 2019 – Oct 23, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

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

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.

---
v2: Use P2P_MAX_NOA_NUM instead of erroring out.

---
 drivers/net/wireless/realtek/rtlwifi/ps.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/net/wireless/realtek/rtlwifi/ps.c +6 -0
index 70f04c2f5b17..fff8dda14023 100644
@@ -754,6 +754,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 ==
@@ -848,6 +851,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
maintainer Acked-by on v2 1/1
#1 lore raw
Quoted 7 lines · Laura Abbott

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.

and Please CC to stable
Cc: Stable <[email protected]> # 4.4+

---

Hi Kalle,

This bug was existing since v3.10, and directory of wireless drivers were moved at v4.4. Do I need send another patch to fix this issue for longterm kernel v3.16.75?

Thanks
PK

Quoted 33 lines

---
v2: Use P2P_MAX_NOA_NUM instead of erroring out.
---
 drivers/net/wireless/realtek/rtlwifi/ps.c | 6 ++++++

 1 file changed, 6 insertions(+)
drivers/net/wireless/realtek/rtlwifi/ps.c +3 -0
index 70f04c2f5b17..fff8dda14023 100644
@@ -754,6 +754,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 ==

drivers/net/wireless/realtek/rtlwifi/ps.c +3 -0
@@ -848,6 +851,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 ==

#2 lore raw
Quoted 13 lines · Pkshih
Quoted 7 lines · Laura Abbott

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.

and Please CC to stable
Cc: Stable <[email protected]> # 4.4+

Quoted 7 lines

---

Hi Kalle,

This bug was existing since v3.10, and directory of wireless drivers were moved at v4.4. Do I need send another patch to fix this issue for longterm kernel v3.16.75?

Yeah, I think you need to send a separate patch to the stable list (after this commit is in Linus' tree).

Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
#3 lore raw
In reply to Laura Abbott
Quoted 28 lines · Laura Abbott

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.

---
v2: Use P2P_MAX_NOA_NUM instead of erroring out.

---
 drivers/net/wireless/realtek/rtlwifi/ps.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/net/wireless/realtek/rtlwifi/ps.c +3 -0
index 70f04c2f5b17..fff8dda14023 100644
@@ -754,6 +754,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 ==

drivers/net/wireless/realtek/rtlwifi/ps.c static void rtl_p2p_action_ie(struct ieee80211_hw *hw, void *data, · line 855

Quoted 5 lines
drivers/net/wireless/realtek/rtlwifi/ps.c +2 -0
@@ -848,6 +851,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;

IMHO using min() would be cleaner, but I'm fine with this as well. Up to you.

Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
#4 lore raw
Quoted 30 lines · Kalle Valo
Quoted 28 lines · Laura Abbott

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.

---
v2: Use P2P_MAX_NOA_NUM instead of erroring out.

---
  drivers/net/wireless/realtek/rtlwifi/ps.c | 6 ++++++
  1 file changed, 6 insertions(+)
drivers/net/wireless/realtek/rtlwifi/ps.c +3 -0
index 70f04c2f5b17..fff8dda14023 100644
@@ -754,6 +754,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 ==
@@ -848,6 +851,9 @@ static void rtl_p2p_action_ie(struct ieee80211_hw *hw, void *data,
Quoted 9 lines

drivers/net/wireless/realtek/rtlwifi/ps.c static void rtl_p2p_noa_ie(struct ieee80211_hw *hw, void *data, · line 758

Quoted 5 lines
drivers/net/wireless/realtek/rtlwifi/ps.c +2 -0
  				return;
  			} else {
  				noa_num = (noa_len - 2) / 13;
+				if (noa_num > P2P_MAX_NOA_NUM)
+					noa_num = P2P_MAX_NOA_NUM;

IMHO using min() would be cleaner, but I'm fine with this as well. Up to you.

I believe the intention is to re-write this anyway so I'd prefer to just get this in given the uptick this issue seems to have gotten.

Thanks,
Laura

#5 lore raw
Quoted 41 lines · Laura Abbott
Quoted 30 lines · Kalle Valo
Quoted 28 lines · Laura Abbott

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.

---
v2: Use P2P_MAX_NOA_NUM instead of erroring out.

---
  drivers/net/wireless/realtek/rtlwifi/ps.c | 6 ++++++
  1 file changed, 6 insertions(+)
drivers/net/wireless/realtek/rtlwifi/ps.c +3 -0
index 70f04c2f5b17..fff8dda14023 100644
@@ -754,6 +754,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 ==
@@ -848,6 +851,9 @@ static void rtl_p2p_action_ie(struct ieee80211_hw *hw, void *data,
Quoted 9 lines

drivers/net/wireless/realtek/rtlwifi/ps.c static void rtl_p2p_noa_ie(struct ieee80211_hw *hw, void *data, · line 758

Quoted 5 lines
drivers/net/wireless/realtek/rtlwifi/ps.c +2 -0
  				return;
  			} else {
  				noa_num = (noa_len - 2) / 13;
+				if (noa_num > P2P_MAX_NOA_NUM)
+					noa_num = P2P_MAX_NOA_NUM;

IMHO using min() would be cleaner, but I'm fine with this as well. Up to you.

Quoted 2 lines

I believe the intention is to re-write this anyway so I'd prefer to just get this in given the uptick this issue seems to have gotten.

Ok, I'll queue this to v5.4.

Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
#6 lore raw
In reply to Laura Abbott
Quoted 8 lines · Laura Abbott

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.

Patch applied to wireless-drivers.git, thanks.

8c55dedb795b rtlwifi: Fix potential overflow on P2P code

Signature · 3 lines
https://patchwork.kernel.org/patch/11198315/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches