From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 8 Mar 2007 02:50:54 +0000 (-0800)
Subject: Fix UDP header pointer after pskb_trim_rcsum()
X-Git-Tag: v2.6.20.3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83d8af5f4226c3ab9156cbb77d5b079b65f31f19;p=thirdparty%2Fkernel%2Fstable.git

Fix UDP header pointer after pskb_trim_rcsum()

[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: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index cfff930f2bafc..f8068b06a2612 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1214,6 +1214,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct hlist_head udptable[],
 
 		if (ulen < sizeof(*uh) || pskb_trim_rcsum(skb, ulen))
 			goto short_packet;
+		uh = skb->h.uh;
 
 		udp4_csum_init(skb, uh);