Commit f8a0a781 authored Dec 18, 2010 by Felix Fietkau Committed by John W. Linville Dec 20, 2010

mac80211: fix potentially redundant skb data copying



When an skb is shared, it needs to be duplicated, along with its data buffer.
If the skb does not have enough headroom, using skb_copy might cause the data
buffer to be copied twice (once by skb_copy and once by pskb_expand_head).
Fix this by using skb_clone initially and letting ieee80211_skb_resize sort
out the rest.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 4cd06a34

net/mac80211/tx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1934,7 +1934,7 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
		*/
		if (skb_shared(skb)) {
		tmp_skb = skb;
		skb = skb_copy(skb, GFP_ATOMIC);
		skb = skb_clone(skb, GFP_ATOMIC);
		kfree_skb(tmp_skb);

		if (!skb) {

Admin message