From feb1263b4ec481b5845d5c02dc6d297c6f935549 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 5 Feb 2008 03:15:50 -0800
Subject: [PATCH] --- yaml --- r: 83285 b: refs/heads/master c:
 8cf229437fd826c32a44546899412b1eb3e1db6f h: refs/heads/master i:   83283:
 80b11918c696a782a8fc913f01f461fa5d0183b1 v: v3

---
 [refs]                | 2 +-
 trunk/net/ipv4/icmp.c | 3 ++-
 trunk/net/ipv6/icmp.c | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a6eb2b09b890..7275f55abe45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d8c0aa9433b09387d9021358baef7939f9b32c4
+refs/heads/master: 8cf229437fd826c32a44546899412b1eb3e1db6f
diff --git a/trunk/net/ipv4/icmp.c b/trunk/net/ipv4/icmp.c
index a7321a82df6d..a13c074dac09 100644
--- a/trunk/net/ipv4/icmp.c
+++ b/trunk/net/ipv4/icmp.c
@@ -1015,7 +1015,8 @@ int icmp_rcv(struct sk_buff *skb)
 			goto error;
 	}
 
-	__skb_pull(skb, sizeof(*icmph));
+	if (!pskb_pull(skb, sizeof(*icmph)))
+		goto error;
 
 	icmph = icmp_hdr(skb);
 
diff --git a/trunk/net/ipv6/icmp.c b/trunk/net/ipv6/icmp.c
index cbb5b9cf84ad..121d517bf91c 100644
--- a/trunk/net/ipv6/icmp.c
+++ b/trunk/net/ipv6/icmp.c
@@ -683,7 +683,8 @@ static int icmpv6_rcv(struct sk_buff *skb)
 		}
 	}
 
-	__skb_pull(skb, sizeof(*hdr));
+	if (!pskb_pull(skb, sizeof(*hdr)))
+		goto discard_it;
 
 	hdr = icmp6_hdr(skb);