ip_output: do skb ufo init for peeked non ufo skb as well (e93b7d74) · Commits · 戴 / test

Now, if user application does: sendto len<mtu flag MSG_MORE sendto len>mtu flag 0 The skb is not treated as fragmented one because it is not initialized that way. So move the initialization to fix this. introduced by: commit "[IPv4/IPv6]: UFO Scatter-gather approach" Signed-off-by:

Jiri Pirko <jiri@resnulli.us> Acked-by:

Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/ipv4/ip_output.c

+9 −4

Original line number	Diff line number	Diff line
		@@ -772,15 +772,20 @@ static inline int ip_ufo_append_data(struct sock *sk,
		/* initialize protocol header pointer */
		skb->transport_header = skb->network_header + fragheaderlen;

		skb->ip_summed = CHECKSUM_PARTIAL;
		skb->csum = 0;


		__skb_queue_tail(queue, skb);
		} else if (skb_is_gso(skb)) {
		goto append;
		}

		skb->ip_summed = CHECKSUM_PARTIAL;
		/* specify the length of each IP datagram fragment */
		skb_shinfo(skb)->gso_size = maxfraglen - fragheaderlen;
		skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
		__skb_queue_tail(queue, skb);
		}

		append:
		return skb_append_datato_frags(sk, skb, getfrag, from,
		(length - transhdrlen));
		}

Admin message