Commit 6f85a124 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

net: Preserve netfilter attributes in skb_gso_segment using __copy_skb_header 



skb_gso_segment didn't preserve some attributes in the original skb
such as the netfilter fields.  This was harmless until they were used
which is the case for packets going through lo.

This patch makes it call __copy_skb_header which also picks up some
other missing attributes.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7447ef63

net/core/skbuff.c

+2 −10
Original line number Diff line number Diff line
@@ -2256,14 +2256,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, int features) 
			segs = nskb;

		tail = nskb;



		nskb->dev = skb->dev;

		skb_copy_queue_mapping(nskb, skb);

		nskb->priority = skb->priority;

		nskb->protocol = skb->protocol;

		nskb->vlan_tci = skb->vlan_tci;

		nskb->dst = dst_clone(skb->dst);

		memcpy(nskb->cb, skb->cb, sizeof(skb->cb));

		nskb->pkt_type = skb->pkt_type;

		__copy_skb_header(nskb, skb);

		nskb->mac_len = skb->mac_len;



		skb_reserve(nskb, headroom);
@@ -2274,6 +2267,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, int features) 
		skb_copy_from_linear_data(skb, skb_put(nskb, doffset),

					  doffset);

		if (!sg) {

			nskb->ip_summed = CHECKSUM_NONE;

			nskb->csum = skb_copy_and_csum_bits(skb, offset,

							    skb_put(nskb, len),

							    len, 0);
@@ -2283,8 +2277,6 @@ struct sk_buff *skb_segment(struct sk_buff *skb, int features) 
		frag = skb_shinfo(nskb)->frags;

		k = 0;



		nskb->ip_summed = CHECKSUM_PARTIAL;

		nskb->csum = skb->csum;

		skb_copy_from_linear_data_offset(skb, offset,

						 skb_put(nskb, hsize), hsize);

CRA Git | Maintained and supported by SUSTech CRA and CCSE