Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cc4b7cb authored by James Hughes's avatar James Hughes Committed by Kalle Valo
Browse files

brcmfmac: Make skb header writable before use 



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: default avatarJames Hughes <james.hughes@raspberrypi.org>
Acked-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 455a1eb4

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

+5 −14
Original line number Diff line number Diff line
@@ -210,23 +210,14 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb, 
		goto done;

	}



	/* Make sure there's enough room for any header */

	if (skb_headroom(skb) < drvr->hdrlen) {

		struct sk_buff *skb2;



		brcmf_dbg(INFO, "%s: insufficient headroom\n",

	/* Make sure there's enough writable headroom*/

	ret = skb_cow_head(skb, drvr->hdrlen);

	if (ret < 0) {

		brcmf_err("%s: skb_cow_head failed\n",

			  brcmf_ifname(ifp));

		drvr->bus_if->tx_realloc++;

		skb2 = skb_realloc_headroom(skb, drvr->hdrlen);

		dev_kfree_skb(skb);

		skb = skb2;

		if (skb == NULL) {

			brcmf_err("%s: skb_realloc_headroom failed\n",

				  brcmf_ifname(ifp));

			ret = -ENOMEM;

		goto done;

	}

	}



	/* validate length for ether packet */

	if (skb->len < sizeof(*eh)) {