From ded78a452f3acdc7feb4e07c73ff331e923798fc Mon Sep 17 00:00:00 2001 From: Jesper Dangaard Brouer Date: Thu, 5 Feb 2009 15:05:45 -0800 Subject: [PATCH] --- yaml --- r: 130987 b: refs/heads/master c: 7b5e56f9d635643ad54f2f42e69ad16b80a2cff1 h: refs/heads/master i: 130985: 8f1843e08611e0b44a422e761288d046b2760cb5 130983: 628646c71f5b85d1f6949d8e3a63e55444430c0d v: v3 --- [refs] | 2 +- trunk/net/ipv4/udp.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5b33d3f838ca..ef95152910a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b98ac702f49042ab0c382b839465b95a2bd0cd65 +refs/heads/master: 7b5e56f9d635643ad54f2f42e69ad16b80a2cff1 diff --git a/trunk/net/ipv4/udp.c b/trunk/net/ipv4/udp.c index 1ab180bad72a..cc3a0a06c004 100644 --- a/trunk/net/ipv4/udp.c +++ b/trunk/net/ipv4/udp.c @@ -1231,7 +1231,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, int proto) { struct sock *sk; - struct udphdr *uh = udp_hdr(skb); + struct udphdr *uh; unsigned short ulen; struct rtable *rt = (struct rtable*)skb->dst; __be32 saddr = ip_hdr(skb)->saddr; @@ -1244,6 +1244,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, if (!pskb_may_pull(skb, sizeof(struct udphdr))) goto drop; /* No space for header. */ + uh = udp_hdr(skb); ulen = ntohs(uh->len); if (ulen > skb->len) goto short_packet;