diff options
author | Hante Meuleman <meuleman@broadcom.com> | 2014-12-03 15:05:27 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-12-04 11:35:02 -0500 |
commit | 333c2aa029b847051a2db76a6ca59f699a520030 (patch) | |
tree | 74b2aed063e78b4b6af893812f52991e264e44c4 | |
parent | 5580373fb27706f07be3375c304558980eb90c4e (diff) |
brcmfmac: Fix bitmap malloc bug in msgbuf.
Cc: stable@vger.kernel.org # v3.17, v3.18
Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c b/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c index 9f783db34ae5..5b0b70fa1aea 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c | |||
@@ -1354,6 +1354,7 @@ int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr) | |||
1354 | } | 1354 | } |
1355 | INIT_WORK(&msgbuf->txflow_work, brcmf_msgbuf_txflow_worker); | 1355 | INIT_WORK(&msgbuf->txflow_work, brcmf_msgbuf_txflow_worker); |
1356 | count = BITS_TO_LONGS(if_msgbuf->nrof_flowrings); | 1356 | count = BITS_TO_LONGS(if_msgbuf->nrof_flowrings); |
1357 | count = count * sizeof(unsigned long); | ||
1357 | msgbuf->flow_map = kzalloc(count, GFP_KERNEL); | 1358 | msgbuf->flow_map = kzalloc(count, GFP_KERNEL); |
1358 | if (!msgbuf->flow_map) | 1359 | if (!msgbuf->flow_map) |
1359 | goto fail; | 1360 | goto fail; |