1 files changed, 2 insertions, 2 deletions

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 6e890f51b7d8..6233e9856016 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -635,7 +635,7 @@ struct pneigh_entry * pneigh_lookup(struct neigh_table *tbl,
 
         ASSERT_RTNL();
 
-        n = kmalloc(sizeof(*n) + key_len, GFP_KERNEL);
+        n = kzalloc(sizeof(*n) + key_len, GFP_KERNEL);
         if (!n)
                 goto out;
 
@@ -1271,7 +1271,7 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,
                          * we can reinject the packet there.
                          */
                         n2 = NULL;
-                        if (dst) {
+                        if (dst && dst->obsolete != DST_OBSOLETE_DEAD) {
                                 n2 = dst_neigh_lookup_skb(dst, skb);
                                 if (n2)
                                         n1 = n2;