diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-16 09:06:57 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-16 09:06:57 +0200 |
| commit | 956f004a044007ea3b8fb19a525535933bb4f2a4 (patch) | |
| tree | a8dbe5a16d8786083bd1e3393c36133b74c30691 /drivers/staging/rtl8723bs | |
| parent | staging: gasket: remove gasket_wait_sync() (diff) | |
| parent | Linux 4.18-rc5 (diff) | |
| download | linux-dev-956f004a044007ea3b8fb19a525535933bb4f2a4.tar.xz linux-dev-956f004a044007ea3b8fb19a525535933bb4f2a4.zip | |
Merge 4.18-rc5 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8723bs')
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_ap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c index 45c05527a57a..faf4b4158cfa 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ap.c +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c @@ -1051,7 +1051,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) return _FAIL; - if (len > MAX_IE_SZ) + if (len < 0 || len > MAX_IE_SZ) return _FAIL; pbss_network->IELength = len; |