Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c55dedb authored by Laura Abbott's avatar Laura Abbott Committed by Kalle Valo
Browse files

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.

Reported-by: default avatarNicolas Waisman <nico@semmle.com>
Signed-off-by: default avatarLaura Abbott <labbott@redhat.com>
Acked-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 7cded565

drivers/net/wireless/realtek/rtlwifi/ps.c

+6 −0
Original line number Diff line number Diff line
@@ -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 ==