diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2017-10-16 17:06:54 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2017-10-16 17:09:24 +0300 |
| commit | 0fac9e2dff00a2344ffc81d82749181ffae408a2 (patch) | |
| tree | 1399ce5ce12955c971c4727dd70bc8b4db2754f1 /drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c | |
| parent | a39644b235c1a45f84d6e16603cacb93740ed2d4 (diff) | |
| parent | a6127b4440d1f74f26b64006b2f50c9dc6d66efc (diff) | |
| download | linux-0fac9e2dff00a2344ffc81d82749181ffae408a2.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
Mark Brown reported that there are conflicts in iwlwifi between the two trees
so fix those now.
Diffstat (limited to 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c')
| -rw-r--r-- | drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c index 27e661fa356f..e7eaa57d11d9 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c @@ -424,7 +424,8 @@ void brcmf_fweh_process_event(struct brcmf_pub *drvr, if (code != BRCMF_E_IF && !fweh->evt_handler[code]) return; - if (datalen > BRCMF_DCMD_MAXLEN) + if (datalen > BRCMF_DCMD_MAXLEN || + datalen + sizeof(*event_packet) > packet_len) return; if (in_interrupt()) |