diff options
| author | Dan Carpenter | 2014-04-07 08:31:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-04-26 00:45:24 +0200 |
| commit | 9dbd79aeb9842144d9a114a979a12c0949ee11eb (patch) | |
| tree | 450434ee515544a031911342caa5598268d62325 /drivers/staging/rtl8188eu/core/rtw_wlan_util.c | |
| parent | staging: rtl8192u: Fix indentation problems (diff) | |
| download | kernel-qcow2-linux-9dbd79aeb9842144d9a114a979a12c0949ee11eb.tar.gz kernel-qcow2-linux-9dbd79aeb9842144d9a114a979a12c0949ee11eb.tar.xz kernel-qcow2-linux-9dbd79aeb9842144d9a114a979a12c0949ee11eb.zip | |
Staging: rtl8188eu: overflow in update_sta_support_rate()
The ->SupportedRates[] array has NDIS_802_11_LENGTH_RATES_EX (16)
elements. Since "ie_len" comes from then network and can go up to 255
then it means we should add a range check to prevent memory corruption.
Fixes: d6846af679e0 ('staging: r8188eu: Add files for new driver - part 7')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8188eu/core/rtw_wlan_util.c')
| -rw-r--r-- | drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c index 3dd90599fd4b..6c9e9a16b2e9 100644 --- a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c @@ -1599,13 +1599,18 @@ int update_sta_support_rate(struct adapter *padapter, u8 *pvar_ie, uint var_ie_l pIE = (struct ndis_802_11_var_ie *)rtw_get_ie(pvar_ie, _SUPPORTEDRATES_IE_, &ie_len, var_ie_len); if (pIE == NULL) return _FAIL; + if (ie_len > NDIS_802_11_LENGTH_RATES_EX) + return _FAIL; memcpy(pmlmeinfo->FW_sta_info[cam_idx].SupportedRates, pIE->data, ie_len); supportRateNum = ie_len; pIE = (struct ndis_802_11_var_ie *)rtw_get_ie(pvar_ie, _EXT_SUPPORTEDRATES_IE_, &ie_len, var_ie_len); - if (pIE) + if (pIE) { + if (supportRateNum + ie_len > NDIS_802_11_LENGTH_RATES_EX) + return _FAIL; memcpy((pmlmeinfo->FW_sta_info[cam_idx].SupportedRates + supportRateNum), pIE->data, ie_len); + } return _SUCCESS; } |