Patch "brcmfmac: Ensure pointer correctly set if skb data location changes" has been added to the 4.11-stable tree

This is a note to let you know that I've just added the patch titled

brcmfmac: Ensure pointer correctly set if skb data location changes

to the 4.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
brcmfmac-ensure-pointer-correctly-set-if-skb-data-location-changes.patch
and it can be found in the queue-4.11 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: James Hughes <[email protected]>
Date: Mon, 24 Apr 2017 12:40:50 +0100
Subject: brcmfmac: Ensure pointer correctly set if skb data location changes

From: James Hughes <[email protected]>

commit 455a1eb4654c24560eb9dfc634f29cba3d87601e upstream.

The incoming skb header may be resized if header space is insufficient, which might change the data adddress in the skb. Ensure that a cached pointer to that data is correctly set by moving assignment to after any possible changes.

---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

@@ -198,7 +198,7 @@ static netdev_tx_t brcmf_netdev_start_xm
 	int ret;
 	struct brcmf_if *ifp = netdev_priv(ndev);
 	struct brcmf_pub *drvr = ifp->drvr;
-	struct ethhdr *eh = (struct ethhdr *)(skb->data);
+	struct ethhdr *eh;
 
 	brcmf_dbg(DATA, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx);
 

@@ -236,6 +236,8 @@ static netdev_tx_t brcmf_netdev_start_xm
 		goto done;
 	}
 
+	eh = (struct ethhdr *)(skb->data);
+
 	if (eh->h_proto == htons(ETH_P_PAE))
 		atomic_inc(&ifp->pend_8021x_cnt);
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.11/brcmfmac-make-skb-header-writable-before-use.patch queue-4.11/brcmfmac-ensure-pointer-correctly-set-if-skb-data-location-changes.patch