brcmfmac: Ensure pointer correctly set if skb data location changes (455a1eb4) · Commits · e / devices / android_kernel_oneplus_sm7250

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. Signed-off-by:

James Hughes <james.hughes@raspberrypi.org> Acked-by:

Arend van Spriel <arend.vanspriel@broadcom.com> Signed-off-by:

Kalle Valo <kvalo@codeaurora.org>

drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -197,7 +197,7 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb,
		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);

		@@ -235,6 +235,8 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb,
		goto done;
		}

		eh = (struct ethhdr *)(skb->data);

		if (eh->h_proto == htons(ETH_P_PAE))
		atomic_inc(&ifp->pend_8021x_cnt);