diff options
| author |   Laura Abbott <labbott@redhat.com> | 2019-10-18 07:43:21 -0400 |
|---|---|---|
| committer |   Kalle Valo <kvalo@codeaurora.org> | 2019-10-23 13:30:51 +0300 |
| commit | 8c55dedb795be8ec0cf488f98c03a1c2176f7fb1 (patch) | |
| tree | c1033b946d3c8ef7328e5204ab460dc25ef165d1 /drivers/net/wireless/realtek/rtlwifi/ps.c | |
| parent | iwlwifi: pcie: fix merge damage on making QnJ exclusive (diff) | |
| download | linux-dev-8c55dedb795be8ec0cf488f98c03a1c2176f7fb1.tar.xz linux-dev-8c55dedb795be8ec0cf488f98c03a1c2176f7fb1.zip | |
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: 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>
Diffstat (limited to 'drivers/net/wireless/realtek/rtlwifi/ps.c')
| -rw-r--r-- | drivers/net/wireless/realtek/rtlwifi/ps.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/realtek/rtlwifi/ps.c b/drivers/net/wireless/realtek/rtlwifi/ps.c index 70f04c2f5b17..fff8dda14023 100644 --- a/drivers/net/wireless/realtek/rtlwifi/ps.c +++ b/drivers/net/wireless/realtek/rtlwifi/ps.c @@ -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 == |