Revert "netlink: Fix autobind race condition that leads to zero port ID"

Orabug: 22284865

This reverts commit 4e27762417669cb459971635be550eb7b5598286.

That commit, along with d48623677191e0f035d7afd344f92cf880b01f8e, have
been shown to produce a hang in the Oracle Real Application Clusters
(RAC) silent-installation procedure.

Signed-off-by: Dan Duval <dan.duval@oracle.com>

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index eb54d50ecd5172247c00752f9c46838d6ecb8263..b829472767b9489a7557c100cd915e10e4fb4802 100644 (file)
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -1017,7 +1017,7 @@ static inline int netlink_compare(struct rhashtable_compare_arg *arg,
        const struct netlink_compare_arg *x = arg->key;
        const struct netlink_sock *nlk = ptr;
 
-       return nlk->rhash_portid != x->portid ||
+       return nlk->portid != x->portid ||
               !net_eq(sock_net(&nlk->sk), read_pnet(&x->pnet));
 }
 
@@ -1043,7 +1043,7 @@ static int __netlink_insert(struct netlink_table *table, struct sock *sk)
 {
        struct netlink_compare_arg arg;
 
-       netlink_compare_arg_init(&arg, sock_net(sk), nlk_sk(sk)->rhash_portid);
+       netlink_compare_arg_init(&arg, sock_net(sk), nlk_sk(sk)->portid);
        return rhashtable_lookup_insert_key(&table->hash, &arg,
                                            &nlk_sk(sk)->node,
                                            netlink_rhashtable_params);
@@ -1105,7 +1105,7 @@ static int netlink_insert(struct sock *sk, u32 portid)
            unlikely(atomic_read(&table->hash.nelems) >= UINT_MAX))
                goto err;
 
-       nlk_sk(sk)->rhash_portid = portid;
+       nlk_sk(sk)->portid = portid;
        sock_hold(sk);
 
        err = __netlink_insert(table, sk);
@@ -1117,11 +1117,10 @@ static int netlink_insert(struct sock *sk, u32 portid)
                        err = -EOVERFLOW;
                if (err == -EEXIST)
                        err = -EADDRINUSE;
+               nlk_sk(sk)->portid = 0;
                sock_put(sk);
        }
 
-       nlk_sk(sk)->portid = portid;
-
 err:
        release_sock(sk);
        return err;
@@ -3178,7 +3177,7 @@ static inline u32 netlink_hash(const void *data, u32 len, u32 seed)
        const struct netlink_sock *nlk = data;
        struct netlink_compare_arg arg;
 
-       netlink_compare_arg_init(&arg, sock_net(&nlk->sk), nlk->rhash_portid);
+       netlink_compare_arg_init(&arg, sock_net(&nlk->sk), nlk->portid);
        return jhash2((u32 *)&arg, netlink_compare_arg_len / sizeof(u32), seed);
 }
 

diff --git a/net/netlink/af_netlink.h b/net/netlink/af_netlink.h
index 80b2b7526dfd26641542f4c5868fdd5b830056a0..df9a06090db613df696b90f8d7ebb406522597bf 100644 (file)
--- a/net/netlink/af_netlink.h
+++ b/net/netlink/af_netlink.h
@@ -25,7 +25,6 @@ struct netlink_ring {
 struct netlink_sock {
        /* struct sock has to be the first member of netlink_sock */
        struct sock             sk;
-       u32                     rhash_portid;
        u32                     portid;
        u32                     dst_portid;
        u32                     dst_group;