---

yaml --- r: 201079 b: refs/heads/master c: 70c2efa h: refs/heads/master i: 201077: 3415f50 201075: f9495db 201071: e751f1b v: v3
git-mirror · Jul 13, 2010 · 6ce726d · 6ce726d
1 parent 6272178
commit 6ce726d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4363d6acd8d2ec9156f6469c742351e5d122489
+refs/heads/master: 70c2efa5a32a7d38e66224844032160317fa7887
diff --git a/trunk/net/sched/act_nat.c b/trunk/net/sched/act_nat.c
@@ -205,7 +205,7 @@ static int tcf_nat(struct sk_buff *skb, struct tc_action *a,
 	{
 		struct icmphdr *icmph;
 
-		if (!pskb_may_pull(skb, ihl + sizeof(*icmph) + sizeof(*iph)))
+		if (!pskb_may_pull(skb, ihl + sizeof(*icmph)))
 			goto drop;
 
 		icmph = (void *)(skb_network_header(skb) + ihl);
@@ -215,6 +215,9 @@ static int tcf_nat(struct sk_buff *skb, struct tc_action *a,
 		    (icmph->type != ICMP_PARAMETERPROB))
 			break;
 
+		if (!pskb_may_pull(skb, ihl + sizeof(*icmph) + sizeof(*iph)))
+			goto drop;
+
 		iph = (void *)(icmph + 1);
 		if (egress)
 			addr = iph->daddr;