From 8708e1e417e1042ddef429c2bd60d62b1187d6be Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Fri, 23 Dec 2011 14:01:26 +0100
Subject: [PATCH] --- yaml --- r: 279073 b: refs/heads/master c:
 0af051baa8444b7453235552911a353fc7b9bee7 h: refs/heads/master i:   279071:
 405a4b25ec216fad68026a0c160364da063fe9e1 v: v3

---
 [refs]                                   | 2 +-
 trunk/net/ipv4/netfilter/nf_nat_helper.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index ecc26fe8fc53..7c95681a917a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40cfb706cda2bacdecd6e5ab78a21456d28878c7
+refs/heads/master: 0af051baa8444b7453235552911a353fc7b9bee7
diff --git a/trunk/net/ipv4/netfilter/nf_nat_helper.c b/trunk/net/ipv4/netfilter/nf_nat_helper.c
index 049e8b7c3188..af65958f6308 100644
--- a/trunk/net/ipv4/netfilter/nf_nat_helper.c
+++ b/trunk/net/ipv4/netfilter/nf_nat_helper.c
@@ -253,12 +253,6 @@ nf_nat_mangle_udp_packet(struct sk_buff *skb,
 	struct udphdr *udph;
 	int datalen, oldlen;
 
-	/* UDP helpers might accidentally mangle the wrong packet */
-	iph = ip_hdr(skb);
-	if (skb->len < iph->ihl*4 + sizeof(*udph) +
-			       match_offset + match_len)
-		return 0;
-
 	if (!skb_make_writable(skb, skb->len))
 		return 0;