Merge commit 'v3.17' into next

1 files changed, 3 insertions, 3 deletions

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 42b7bcf8045b..ea7d4afe8205 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -663,16 +663,16 @@ 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);
 
-        rcu_read_lock();
         ipprot = rcu_dereference(inet_protos[protocol]);
         if (ipprot && ipprot->err_handler)
                 ipprot->err_handler(skb, info);
-        rcu_read_unlock();
 }
 
 static bool icmp_tag_validation(int proto)