From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 8 Mar 2007 07:21:15 +0000 (+0100)
Subject: [UDP]: Reread uh pointer after pskb_trim
X-Git-Tag: v2.6.16.44-rc1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=822f952f2ab27ca3f06d6fb3e57c34195b1e0583;p=thirdparty%2Fkernel%2Fstable.git

[UDP]: Reread uh pointer after pskb_trim

The header may have moved when trimming.

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

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index da51d01a51030..19df8fedeb752 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1137,6 +1137,7 @@ int udp_rcv(struct sk_buff *skb)
 
 	if (pskb_trim_rcsum(skb, ulen))
 		goto short_packet;
+	uh = skb->h.uh;
 
 	udp_checksum_init(skb, uh, ulen, saddr, daddr);