target/linux/sunxi/patches-3.14/231-2-brcmfmac-fix-use-of-skb-ctrlbuf-in-SDIO.patch

   1 From 3eee5fd6d045dc744f98fd684258e3fdfa667fd6 Mon Sep 17 00:00:00 2001
   2 From: Arend van Spriel <arend@broadcom.com>
   3 Date: Tue, 25 Feb 2014 20:30:27 +0100
   4 Subject: [PATCH] brcmfmac: fix use of skb control buffer in SDIO driver part
   5
   6 The SDIO driver has a 16-bit field defined in the skbuff control buffer.
   7 However, it is accessed as a u32 overwriting other control info. Another
   8 issue is that the field is not initialized for networking packets, but
   9 the control buffer content is unspecified as other networking layers can
  10 use it.
  11
  12 Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
  13 Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
  14 Reviewed-by: Daniel (Deognyoun) Kim <dekim@broadcom.com>
  15 Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
  16 Signed-off-by: Arend van Spriel <arend@broadcom.com>
  17 Signed-off-by: John W. Linville <linville@tuxdriver.com>
  18 ---
  19  drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 10 ++++++----
  20  1 file changed, 6 insertions(+), 4 deletions(-)
  21
  22 diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
  23 index ddaa9ef..e006e7c 100644
  24 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
  25 +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
  26 @@ -1955,7 +1955,7 @@ static int brcmf_sdio_txpkt_prep_sg(struct brcmf_sdio *bus,
  27                 memcpy(pkt_pad->data,
  28                        pkt->data + pkt->len - tail_chop,
  29                        tail_chop);
  30 -               *(u32 *)(pkt_pad->cb) = ALIGN_SKB_FLAG + tail_chop;
  31 +               *(u16 *)(pkt_pad->cb) = ALIGN_SKB_FLAG + tail_chop;
  32                 skb_trim(pkt, pkt->len - tail_chop);
  33                 skb_trim(pkt_pad, tail_pad + tail_chop);
  34                 __skb_queue_after(pktq, pkt, pkt_pad);
  35 @@ -2003,7 +2003,7 @@ brcmf_sdio_txpkt_prep(struct brcmf_sdio *bus, struct sk_buff_head *pktq,
  36                  * already properly aligned and does not
  37                  * need an sdpcm header.
  38                  */
  39 -               if (*(u32 *)(pkt_next->cb) & ALIGN_SKB_FLAG)
  40 +               if (*(u16 *)(pkt_next->cb) & ALIGN_SKB_FLAG)
  41                         continue;
  42
  43                 /* align packet data pointer */
  44 @@ -2067,11 +2067,11 @@ brcmf_sdio_txpkt_postp(struct brcmf_sdio *bus, struct sk_buff_head *pktq)
  45         u8 *hdr;
  46         u32 dat_offset;
  47         u16 tail_pad;
  48 -       u32 dummy_flags, chop_len;
  49 +       u16 dummy_flags, chop_len;
  50         struct sk_buff *pkt_next, *tmp, *pkt_prev;
  51
  52         skb_queue_walk_safe(pktq, pkt_next, tmp) {
  53 -               dummy_flags = *(u32 *)(pkt_next->cb);
  54 +               dummy_flags = *(u16 *)(pkt_next->cb);
  55                 if (dummy_flags & ALIGN_SKB_FLAG) {
  56                         chop_len = dummy_flags & ALIGN_SKB_CHOP_LEN_MASK;
  57                         if (chop_len) {
  58 @@ -2554,6 +2554,8 @@ static int brcmf_sdio_bus_txdata(struct device *dev, struct sk_buff *pkt)
  59
  60         /* Priority based enq */
  61         spin_lock_irqsave(&bus->txqlock, flags);
  62 +       /* reset bus_flags in packet cb */
  63 +       *(u16 *)(pkt->cb) = 0;
  64         if (!brcmf_c_prec_enq(bus->sdiodev->dev, &bus->txq, pkt, prec)) {
  65                 skb_pull(pkt, bus->tx_hdrlen);
  66                 brcmf_err("out of bus->txq !!!\n");
  67 --
  68 2.0.3
  69