---

yaml --- r: 279073 b: refs/heads/master c: 0af051b h: refs/heads/master i: 279071: 405a4b2 v: v3
git-mirror · Dec 23, 2011 · 8708e1e · 8708e1e
1 parent ef112fb
commit 8708e1e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git 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
@@ -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;