Commit 96d7303e authored Jun 05, 2011 by Steffen Klassert Committed by David S. Miller Jun 09, 2011

ipv4: Fix packet size calculation for raw IPsec packets in __ip_append_data



We assume that transhdrlen is positive on the first fragment
which is wrong for raw packets. So we don't add exthdrlen to the
packet size for raw packets. This leads to a reallocation on IPsec
because we have not enough headroom on the skb to place the IPsec
headers. This patch fixes this by adding exthdrlen to the packet
size whenever the send queue of the socket is empty. This issue was
introduced with git commit 1470ddf7 (inet: Remove explicit write
references to sk/inet in ip_append_data)

Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent e23535ca

net/ipv4/ip_output.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -799,7 +799,9 @@ static int __ip_append_data(struct sock *sk,
		int csummode = CHECKSUM_NONE;
		struct rtable rt = (struct rtable )cork->dst;

		exthdrlen = transhdrlen ? rt->dst.header_len : 0;
		skb = skb_peek_tail(queue);

		exthdrlen = !skb ? rt->dst.header_len : 0;
		length += exthdrlen;
		transhdrlen += exthdrlen;
		mtu = cork->fragsize;
		@@ -825,8 +827,6 @@ static int __ip_append_data(struct sock *sk,
		!exthdrlen)
		csummode = CHECKSUM_PARTIAL;

		skb = skb_peek_tail(queue);

		cork->length += length;
		if (((length > mtu) \|\| (skb && skb_is_gso(skb))) &&
		(sk->sk_protocol == IPPROTO_UDP) &&

Admin message