From: Greg Kroah-Hartman Date: Mon, 5 Jan 2015 20:21:29 +0000 (-0800) Subject: 3.17-stable patches X-Git-Tag: v3.10.64~26 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47f991dd96577b8e8095c9b6089214f6eae254bd;p=thirdparty%2Fkernel%2Fstable-queue.git 3.17-stable patches added patches: brcmfmac-fix-bitmap-malloc-bug-in-msgbuf.patch --- diff --git a/queue-3.17/brcmfmac-fix-bitmap-malloc-bug-in-msgbuf.patch b/queue-3.17/brcmfmac-fix-bitmap-malloc-bug-in-msgbuf.patch new file mode 100644 index 00000000000..9b45696bb86 --- /dev/null +++ b/queue-3.17/brcmfmac-fix-bitmap-malloc-bug-in-msgbuf.patch @@ -0,0 +1,30 @@ +From 333c2aa029b847051a2db76a6ca59f699a520030 Mon Sep 17 00:00:00 2001 +From: Hante Meuleman +Date: Wed, 3 Dec 2014 21:05:27 +0100 +Subject: brcmfmac: Fix bitmap malloc bug in msgbuf. + +From: Hante Meuleman + +commit 333c2aa029b847051a2db76a6ca59f699a520030 upstream. + +Reviewed-by: Arend Van Spriel +Reviewed-by: Pieter-Paul Giesberts +Signed-off-by: Hante Meuleman +Signed-off-by: Arend van Spriel +Signed-off-by: John W. Linville +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c ++++ b/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c +@@ -1282,6 +1282,7 @@ int brcmf_proto_msgbuf_attach(struct brc + } + INIT_WORK(&msgbuf->txflow_work, brcmf_msgbuf_txflow_worker); + count = BITS_TO_LONGS(if_msgbuf->nrof_flowrings); ++ count = count * sizeof(unsigned long); + msgbuf->flow_map = kzalloc(count, GFP_ATOMIC); + if (!msgbuf->flow_map) + goto fail; diff --git a/queue-3.17/series b/queue-3.17/series index 3e95b41d1b0..39b439634b3 100644 --- a/queue-3.17/series +++ b/queue-3.17/series @@ -25,3 +25,4 @@ dm-space-map-metadata-fix-sm_bootstrap_get_nr_blocks.patch dm-thin-fix-inability-to-discard-blocks-when-in-out-of-data-space-mode.patch dm-thin-fix-missing-out-of-data-space-to-write-mode-transition-if-blocks-are-released.patch dm-thin-fix-a-race-in-thin_dtr.patch +brcmfmac-fix-bitmap-malloc-bug-in-msgbuf.patch