From 19a7630fc47b963e1f427406b3d6b66611c24930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= Date: Thu, 6 May 2010 03:44:34 +0000 Subject: [PATCH] --- yaml --- r: 190766 b: refs/heads/master c: ccc2d97cb7c798e785c9f198de243e2b59f7073b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/udp.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e10ad4ec3845..3d6d0c3f8dfe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80ea76bb2575c426154b8d61d324197ee3592baa +refs/heads/master: ccc2d97cb7c798e785c9f198de243e2b59f7073b diff --git a/trunk/net/ipv4/udp.c b/trunk/net/ipv4/udp.c index 8fef859db35d..c36522a0f113 100644 --- a/trunk/net/ipv4/udp.c +++ b/trunk/net/ipv4/udp.c @@ -1527,6 +1527,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, uh = udp_hdr(skb); ulen = ntohs(uh->len); + saddr = ip_hdr(skb)->saddr; + daddr = ip_hdr(skb)->daddr; + if (ulen > skb->len) goto short_packet; @@ -1540,9 +1543,6 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, if (udp4_csum_init(skb, uh, proto)) goto csum_error; - saddr = ip_hdr(skb)->saddr; - daddr = ip_hdr(skb)->daddr; - if (rt->rt_flags & (RTCF_BROADCAST|RTCF_MULTICAST)) return __udp4_lib_mcast_deliver(net, skb, uh, saddr, daddr, udptable);