net: Move skb_has_shared_frag check out of GRE code and into segmentation (ddff00d4) · Commits · e / devices / android_kernel_fairphone_FP3

The call skb_has_shared_frag is used in the GRE path and skb_checksum_help to verify that no frags can be modified by an external entity. This check really doesn't belong in the GRE path but in the skb_segment function itself. This way any protocol that might be segmented will be performing this check before attempting to offload a checksum to software. Signed-off-by:

Alexander Duyck <aduyck@mirantis.com> Acked-by:

Tom Herbert <tom@herbertland.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/core/skbuff.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -3173,6 +3173,11 @@ struct sk_buff skb_segment(struct sk_buff head_skb,

		perform_csum_check:
		if (!csum) {
		if (skb_has_shared_frag(nskb)) {
		err = __skb_linearize(nskb);
		if (err)
		goto err;
		}
		if (!nskb->remcsum_offload)
		nskb->ip_summed = CHECKSUM_NONE;
		SKB_GSO_CB(nskb)->csum =

net/ipv4/gre_offload.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -83,17 +83,6 @@ static struct sk_buff gre_gso_segment(struct sk_buff skb,
		if (csum) {
		__be32 *pcsum;

		if (skb_has_shared_frag(skb)) {
		int err;

		err = __skb_linearize(skb);
		if (err) {
		kfree_skb_list(segs);
		segs = ERR_PTR(err);
		goto out;
		}
		}

		skb_reset_transport_header(skb);

		greh = (struct gre_base_hdr *)