From a80e9338e3ffaf3632e1108ededb34bdd6878dd6 Mon Sep 17 00:00:00 2001
From: Neal Cardwell <ncardwell@google.com>
Date: Sat, 24 Nov 2012 18:54:37 +0000
Subject: [PATCH] --- yaml --- r: 336073 b: refs/heads/master c:
 e1a676424c290b1c8d757e3860170ac7ecd89af4 h: refs/heads/master i:   336071:
 c531e1a8cc794830697b4b7c8fe088e173b88fdb v: v3

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

diff --git a/[refs] b/[refs]
index 1f06fc36ef85..dfc3830bd7c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81b401100c01d2357031e874689f89bd788d13cd
+refs/heads/master: e1a676424c290b1c8d757e3860170ac7ecd89af4
diff --git a/trunk/net/ipv4/icmp.c b/trunk/net/ipv4/icmp.c
index f2eccd531746..17ff9fd7cdda 100644
--- a/trunk/net/ipv4/icmp.c
+++ b/trunk/net/ipv4/icmp.c
@@ -257,7 +257,8 @@ static inline bool icmpv4_xrlim_allow(struct net *net, struct rtable *rt,
 		struct inet_peer *peer = inet_getpeer_v4(net->ipv4.peers, fl4->daddr, 1);
 		rc = inet_peer_xrlim_allow(peer,
 					   net->ipv4.sysctl_icmp_ratelimit);
-		inet_putpeer(peer);
+		if (peer)
+			inet_putpeer(peer);
 	}
 out:
 	return rc;