GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-05-07 15:53:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

brcmfmac: Make skb header writable before use

Browse source 
The driver was making changes to the skb_header without
ensuring it was writable (i.e. uncloned).
This patch also removes some boiler plate header size
checking/adjustment code as that is also handled by the
skb_cow_header function used to make header writable.

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>
This commit is contained in:
James Hughes 2017-04-25 10:15:06 +01:00 • committed by Kalle Valo
parent 455a1eb465
commit 9cc4b7cb86
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
View file

@ -210,22 +210,13 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb,
goto done; goto done;
} }
/* Make sure there's enough room for any header */ /* Make sure there's enough writable headroom*/
if (skb_headroom(skb) < drvr->hdrlen) { ret = skb_cow_head(skb, drvr->hdrlen);
struct sk_buff *skb2; if (ret < 0) {
brcmf_err("%s: skb_cow_head failed\n",
brcmf_dbg(INFO, "%s: insufficient headroom\n",
brcmf_ifname(ifp)); brcmf_ifname(ifp));
drvr->bus_if->tx_realloc++;
skb2 = skb_realloc_headroom(skb, drvr->hdrlen);
dev_kfree_skb(skb); dev_kfree_skb(skb);
skb = skb2; goto done;
if (skb == NULL) {
brcmf_err("%s: skb_realloc_headroom failed\n",
brcmf_ifname(ifp));
ret = -ENOMEM;
goto done;
}
} }
/* validate length for ether packet */ /* validate length for ether packet */