2 files changed, 3 insertions, 6 deletions

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 42b7bcf8045b..092400ef88d0 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -663,8 +663,10 @@ static void icmp_socket_deliver(struct sk_buff *skb, u32 info)
         /* Checkin full IP header plus 8 bytes of protocol to
          * avoid additional coding at protocol handlers.
          */
-        if (!pskb_may_pull(skb, iph->ihl * 4 + 8))
+        if (!pskb_may_pull(skb, iph->ihl * 4 + 8)) {
+                ICMP_INC_STATS_BH(dev_net(skb->dev), ICMP_MIB_INERRORS);
                 return;
+        }
 
         raw_icmp_error(skb, protocol, info);
 
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 1edc739b9da5..d0ba39537d5c 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -344,11 +344,6 @@ void tcp_v4_err(struct sk_buff *icmp_skb, u32 info)
         int err;
         struct net *net = dev_net(icmp_skb->dev);
 
-        if (icmp_skb->len < (iph->ihl << 2) + 8) {
-                ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS);
-                return;
-        }
-
         sk = inet_lookup(net, &tcp_hashinfo, iph->daddr, th->dest,
                         iph->saddr, th->source, inet_iif(icmp_skb));
         if (!sk) {