From 8a955c5cc26eef2283fc30aecb7d92f5aca713a9 Mon Sep 17 00:00:00 2001
From: Zhouyi Zhou <zhouzhouyi@gmail.com>
Date: Thu, 14 Mar 2013 17:21:50 +0000
Subject: [PATCH] --- yaml --- r: 361455 b: refs/heads/master c:
 aaa0c23cb90141309f5076ba5e3bfbd39544b985 h: refs/heads/master i:   361453:
 5ef2e2810e4ee43e4c2e00c2eb5c63c9c9ebf2f9   361451:
 4c3ae373e53bfa03471d1a3e7b656bcac0ef67d7   361447:
 5cf3f390db3156994082348c1c89b17a8296b03a   361439:
 4ca88eb86130fb1aeea22d54d3d6b31e6358d581 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/infiniband/hw/cxgb4/cm.c | 12 ++++++++++++
 trunk/include/net/dst.h                |  6 ++++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3d15c08886e4..f0a83eeab00b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e731cb986d564c4938bcba89ff5f4aea1d8e2fb
+refs/heads/master: aaa0c23cb90141309f5076ba5e3bfbd39544b985
diff --git a/trunk/drivers/infiniband/hw/cxgb4/cm.c b/trunk/drivers/infiniband/hw/cxgb4/cm.c
index 565bfb161c1a..a3fde52840ca 100644
--- a/trunk/drivers/infiniband/hw/cxgb4/cm.c
+++ b/trunk/drivers/infiniband/hw/cxgb4/cm.c
@@ -1575,6 +1575,12 @@ static int c4iw_reconnect(struct c4iw_ep *ep)
 
 	neigh = dst_neigh_lookup(ep->dst,
 			&ep->com.cm_id->remote_addr.sin_addr.s_addr);
+	if (!neigh) {
+		pr_err("%s - cannot alloc neigh.\n", __func__);
+		err = -ENOMEM;
+		goto fail4;
+	}
+
 	/* get a l2t entry */
 	if (neigh->dev->flags & IFF_LOOPBACK) {
 		PDBG("%s LOOPBACK\n", __func__);
@@ -3053,6 +3059,12 @@ static int rx_pkt(struct c4iw_dev *dev, struct sk_buff *skb)
 	dst = &rt->dst;
 	neigh = dst_neigh_lookup_skb(dst, skb);
 
+	if (!neigh) {
+		pr_err("%s - failed to allocate neigh!\n",
+		       __func__);
+		goto free_dst;
+	}
+
 	if (neigh->dev->flags & IFF_LOOPBACK) {
 		pdev = ip_dev_find(&init_net, iph->daddr);
 		e = cxgb4_l2t_get(dev->rdev.lldi.l2t, neigh,
diff --git a/trunk/include/net/dst.h b/trunk/include/net/dst.h
index 853cda11e518..1f8fd109e225 100644
--- a/trunk/include/net/dst.h
+++ b/trunk/include/net/dst.h
@@ -413,13 +413,15 @@ static inline int dst_neigh_output(struct dst_entry *dst, struct neighbour *n,
 
 static inline struct neighbour *dst_neigh_lookup(const struct dst_entry *dst, const void *daddr)
 {
-	return dst->ops->neigh_lookup(dst, NULL, daddr);
+	struct neighbour *n = dst->ops->neigh_lookup(dst, NULL, daddr);
+	return IS_ERR(n) ? NULL : n;
 }
 
 static inline struct neighbour *dst_neigh_lookup_skb(const struct dst_entry *dst,
 						     struct sk_buff *skb)
 {
-	return dst->ops->neigh_lookup(dst, skb, NULL);
+	struct neighbour *n =  dst->ops->neigh_lookup(dst, skb, NULL);
+	return IS_ERR(n) ? NULL : n;
 }
 
 static inline void dst_link_failure(struct sk_buff *skb)