1 files changed, 7 insertions, 7 deletions

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index cbadb942c332..793c0bb8c4fd 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -596,12 +596,12 @@ static struct fib_nh_exception *fnhe_oldest(struct fnhe_hash_bucket *hash)
 
 static inline u32 fnhe_hashfun(__be32 daddr)
 {
+        static u32 fnhe_hashrnd __read_mostly;
         u32 hval;
 
-        hval = (__force u32) daddr;
-        hval ^= (hval >> 11) ^ (hval >> 22);
-
-        return hval & (FNHE_HASH_SIZE - 1);
+        net_get_random_once(&fnhe_hashrnd, sizeof(fnhe_hashrnd));
+        hval = jhash_1word((__force u32) daddr, fnhe_hashrnd);
+        return hash_32(hval, FNHE_HASH_SHIFT);
 }
 
 static void fill_route_from_fnhe(struct rtable *rt, struct fib_nh_exception *fnhe)
@@ -628,12 +628,12 @@ static void update_or_create_fnhe(struct fib_nh *nh, __be32 daddr, __be32 gw,
 
         spin_lock_bh(&fnhe_lock);
 
-        hash = nh->nh_exceptions;
+        hash = rcu_dereference(nh->nh_exceptions);
         if (!hash) {
                 hash = kzalloc(FNHE_HASH_SIZE * sizeof(*hash), GFP_ATOMIC);
                 if (!hash)
                         goto out_unlock;
-                nh->nh_exceptions = hash;
+                rcu_assign_pointer(nh->nh_exceptions, hash);
         }
 
         hash += hval;
@@ -1242,7 +1242,7 @@ static unsigned int ipv4_mtu(const struct dst_entry *dst)
 
 static struct fib_nh_exception *find_exception(struct fib_nh *nh, __be32 daddr)
 {
-        struct fnhe_hash_bucket *hash = nh->nh_exceptions;
+        struct fnhe_hash_bucket *hash = rcu_dereference(nh->nh_exceptions);
         struct fib_nh_exception *fnhe;
         u32 hval;