1 files changed, 5 insertions, 2 deletions

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index a16cf1ec5e5e..2328acbd16cd 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -358,11 +358,12 @@ struct neighbour *neigh_lookup(struct neigh_table *tbl, const void *pkey,
 {
         struct neighbour *n;
         int key_len = tbl->key_len;
-        u32 hash_val = tbl->hash(pkey, dev);
+        u32 hash_val;
 
         NEIGH_CACHE_STAT_INC(tbl, lookups);
 
         read_lock_bh(&tbl->lock);
+        hash_val = tbl->hash(pkey, dev);
         for (n = tbl->hash_buckets[hash_val & tbl->hash_mask]; n; n = n->next) {
                 if (dev == n->dev && !memcmp(n->primary_key, pkey, key_len)) {
                         neigh_hold(n);
@@ -379,11 +380,12 @@ struct neighbour *neigh_lookup_nodev(struct neigh_table *tbl, struct net *net,
 {
         struct neighbour *n;
         int key_len = tbl->key_len;
-        u32 hash_val = tbl->hash(pkey, NULL);
+        u32 hash_val;
 
         NEIGH_CACHE_STAT_INC(tbl, lookups);
 
         read_lock_bh(&tbl->lock);
+        hash_val = tbl->hash(pkey, NULL);
         for (n = tbl->hash_buckets[hash_val & tbl->hash_mask]; n; n = n->next) {
                 if (!memcmp(n->primary_key, pkey, key_len) &&
                     (net == n->dev->nd_net)) {
@@ -507,6 +509,7 @@ struct pneigh_entry * pneigh_lookup(struct neigh_table *tbl,
         if (tbl->pconstructor && tbl->pconstructor(n)) {
                 if (dev)
                         dev_put(dev);
+                release_net(net);
                 kfree(n);
                 n = NULL;
                 goto out;