Commit da952315 authored Jul 11, 2006 by Herbert Xu Committed by David S. Miller Jul 12, 2006

[IPCOMP]: Fix truesize after decompression

The truesize check has uncovered the fact that we forgot to update truesize
after pskb_expand_head. Unfortunately pskb_expand_head can't update it for
us because it's used in all sorts of different contexts, some of which would
not allow truesize to be updated by itself.

So the solution for now is to simply update it in IPComp.

This patch also changes skb_put to __skb_put since we've just expanded
tailroom by exactly that amount so we know it's there (but gcc does not).

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 8a6ce0c0

net/ipv4/ipcomp.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,8 @@ static int ipcomp_decompress(struct xfrm_state x, struct sk_buff skb)
		if (err)
		goto out;

		skb_put(skb, dlen - plen);
		skb->truesize += dlen - plen;
		__skb_put(skb, dlen - plen);
		memcpy(skb->data, scratch, dlen);
		out:
		put_cpu();

net/ipv6/ipcomp6.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -109,7 +109,8 @@ static int ipcomp6_input(struct xfrm_state x, struct sk_buff skb)
		goto out_put_cpu;
		}

		skb_put(skb, dlen - plen);
		skb->truesize += dlen - plen;
		__skb_put(skb, dlen - plen);
		memcpy(skb->data, scratch, dlen);
		err = ipch->nexthdr;

Admin message