Commit e6a11701 authored Oct 18, 2019 by Laura Abbott Committed by Greg Kroah-Hartman Oct 26, 2019

rtlwifi: Fix potential overflow on P2P code



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.

Bug: 142967706
Reported-by: Nicolas Waisman <nico@semmle.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
Acked-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I90a9b285feb50b6b5c30e242756d47848902b634

parent ff2d0125

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -774,6 +774,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 ==
		@@ -868,6 +871,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 ==