git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
wireless
/
broadcom
/
brcm80211
/
brcmfmac
/
fweh.c
diff --git
a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
index 27e661fa356f26a0c4c54583d29bede921924e59..e7eaa57d11d98f61280bd99013e649aacec7d0d6 100644
(file)
--- 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())