tipc: fix endianness on tipc subscriber messages

[firefly-linux-kernel-4.4.55.git] / net / key / af_key.c

diff --git a/net/key/af_key.c b/net/key/af_key.c
index c269ce6094d6462be54f656c7bb76d90f8be3f2e..368707882647bb83293a5be6536b00d6ccca2982 100644 (file)
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -41,10 +41,10 @@ struct netns_pfkey {
        struct hlist_head table;
        atomic_t socks_nr;
 };
-static DECLARE_WAIT_QUEUE_HEAD(pfkey_table_wait);
-static DEFINE_RWLOCK(pfkey_table_lock);
-static atomic_t pfkey_table_users = ATOMIC_INIT(0);
+static DEFINE_MUTEX(pfkey_mutex);
 
+#define DUMMY_MARK 0
+static struct xfrm_mark dummy_mark = {0, 0};
 struct pfkey_sock {
        /* struct sock must be the first member of struct pfkey_sock */
        struct sock     sk;
@@ -108,50 +108,6 @@ static void pfkey_sock_destruct(struct sock *sk)
        atomic_dec(&net_pfkey->socks_nr);
 }
 
-static void pfkey_table_grab(void)
-{
-       write_lock_bh(&pfkey_table_lock);
-
-       if (atomic_read(&pfkey_table_users)) {
-               DECLARE_WAITQUEUE(wait, current);
-
-               add_wait_queue_exclusive(&pfkey_table_wait, &wait);
-               for(;;) {
-                       set_current_state(TASK_UNINTERRUPTIBLE);
-                       if (atomic_read(&pfkey_table_users) == 0)
-                               break;
-                       write_unlock_bh(&pfkey_table_lock);
-                       schedule();
-                       write_lock_bh(&pfkey_table_lock);
-               }
-
-               __set_current_state(TASK_RUNNING);
-               remove_wait_queue(&pfkey_table_wait, &wait);
-       }
-}
-
-static __inline__ void pfkey_table_ungrab(void)
-{
-       write_unlock_bh(&pfkey_table_lock);
-       wake_up(&pfkey_table_wait);
-}
-
-static __inline__ void pfkey_lock_table(void)
-{
-       /* read_lock() synchronizes us to pfkey_table_grab */
-
-       read_lock(&pfkey_table_lock);
-       atomic_inc(&pfkey_table_users);
-       read_unlock(&pfkey_table_lock);
-}
-
-static __inline__ void pfkey_unlock_table(void)
-{
-       if (atomic_dec_and_test(&pfkey_table_users))
-               wake_up(&pfkey_table_wait);
-}
-
-
 static const struct proto_ops pfkey_ops;
 
 static void pfkey_insert(struct sock *sk)
@@ -159,16 +115,16 @@ static void pfkey_insert(struct sock *sk)
        struct net *net = sock_net(sk);
        struct netns_pfkey *net_pfkey = net_generic(net, pfkey_net_id);
 
-       pfkey_table_grab();
-       sk_add_node(sk, &net_pfkey->table);
-       pfkey_table_ungrab();
+       mutex_lock(&pfkey_mutex);
+       sk_add_node_rcu(sk, &net_pfkey->table);
+       mutex_unlock(&pfkey_mutex);
 }
 
 static void pfkey_remove(struct sock *sk)
 {
-       pfkey_table_grab();
-       sk_del_node_init(sk);
-       pfkey_table_ungrab();
+       mutex_lock(&pfkey_mutex);
+       sk_del_node_init_rcu(sk);
+       mutex_unlock(&pfkey_mutex);
 }
 
 static struct proto key_proto = {
@@ -223,6 +179,8 @@ static int pfkey_release(struct socket *sock)
        sock_orphan(sk);
        sock->sk = NULL;
        skb_queue_purge(&sk->sk_write_queue);
+
+       synchronize_rcu();
        sock_put(sk);
 
        return 0;
@@ -277,8 +235,8 @@ static int pfkey_broadcast(struct sk_buff *skb, gfp_t allocation,
        if (!skb)
                return -ENOMEM;
 
-       pfkey_lock_table();
-       sk_for_each(sk, node, &net_pfkey->table) {
+       rcu_read_lock();
+       sk_for_each_rcu(sk, node, &net_pfkey->table) {
                struct pfkey_sock *pfk = pfkey_sk(sk);
                int err2;
 
@@ -309,7 +267,7 @@ static int pfkey_broadcast(struct sk_buff *skb, gfp_t allocation,
                if ((broadcast_flags & BROADCAST_REGISTERED) && err)
                        err = err2;
        }
-       pfkey_unlock_table();
+       rcu_read_unlock();
 
        if (one_sk != NULL)
                err = pfkey_broadcast_one(skb, &skb2, allocation, one_sk);
@@ -691,7 +649,7 @@ static struct  xfrm_state *pfkey_xfrm_state_lookup(struct net *net, struct sadb_
        if (!xaddr)
                return NULL;
 
-       return xfrm_state_lookup(net, xaddr, sa->sadb_sa_spi, proto, family);
+       return xfrm_state_lookup(net, DUMMY_MARK, xaddr, sa->sadb_sa_spi, proto, family);
 }
 
 #define PFKEY_ALIGN8(a) (1 + (((a) - 1) | (8 - 1)))
@@ -1360,7 +1318,7 @@ static int pfkey_getspi(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
        }
 
        if (hdr->sadb_msg_seq) {
-               x = xfrm_find_acq_byseq(net, hdr->sadb_msg_seq);
+               x = xfrm_find_acq_byseq(net, DUMMY_MARK, hdr->sadb_msg_seq);
                if (x && xfrm_addr_cmp(&x->id.daddr, xdaddr, family)) {
                        xfrm_state_put(x);
                        x = NULL;
@@ -1368,7 +1326,7 @@ static int pfkey_getspi(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
        }
 
        if (!x)
-               x = xfrm_find_acq(net, mode, reqid, proto, xdaddr, xsaddr, 1, family);
+               x = xfrm_find_acq(net, &dummy_mark, mode, reqid, proto, xdaddr, xsaddr, 1, family);
 
        if (x == NULL)
                return -ENOENT;
@@ -1417,7 +1375,7 @@ static int pfkey_acquire(struct sock *sk, struct sk_buff *skb, struct sadb_msg *
        if (hdr->sadb_msg_seq == 0 || hdr->sadb_msg_errno == 0)
                return 0;
 
-       x = xfrm_find_acq_byseq(net, hdr->sadb_msg_seq);
+       x = xfrm_find_acq_byseq(net, DUMMY_MARK, hdr->sadb_msg_seq);
        if (x == NULL)
                return 0;
 
@@ -2368,7 +2326,7 @@ static int pfkey_spddelete(struct sock *sk, struct sk_buff *skb, struct sadb_msg
                        return err;
        }
 
-       xp = xfrm_policy_bysel_ctx(net, XFRM_POLICY_TYPE_MAIN,
+       xp = xfrm_policy_bysel_ctx(net, DUMMY_MARK, XFRM_POLICY_TYPE_MAIN,
                                   pol->sadb_x_policy_dir - 1, &sel, pol_ctx,
                                   1, &err);
        security_xfrm_policy_free(pol_ctx);
@@ -2616,8 +2574,8 @@ static int pfkey_spdget(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
                return -EINVAL;
 
        delete = (hdr->sadb_msg_type == SADB_X_SPDDELETE2);
-       xp = xfrm_policy_byid(net, XFRM_POLICY_TYPE_MAIN, dir,
-                             pol->sadb_x_policy_id, delete, &err);
+       xp = xfrm_policy_byid(net, DUMMY_MARK, XFRM_POLICY_TYPE_MAIN,
+                             dir, pol->sadb_x_policy_id, delete, &err);
        if (xp == NULL)
                return -ENOENT;
 
@@ -2735,8 +2693,11 @@ static int pfkey_spdflush(struct sock *sk, struct sk_buff *skb, struct sadb_msg
        audit_info.secid = 0;
        err = xfrm_policy_flush(net, XFRM_POLICY_TYPE_MAIN, &audit_info);
        err2 = unicast_flush_resp(sk, hdr);
-       if (err || err2)
-               return err ? err : err2;
+       if (err || err2) {
+               if (err == -ESRCH) /* empty table - old silent behavior */
+                       return 0;
+               return err;
+       }
 
        c.data.type = XFRM_POLICY_TYPE_MAIN;
        c.event = XFRM_MSG_FLUSHPOLICY;
@@ -3699,8 +3660,8 @@ static void *pfkey_seq_start(struct seq_file *f, loff_t *ppos)
        struct net *net = seq_file_net(f);
        struct netns_pfkey *net_pfkey = net_generic(net, pfkey_net_id);
 
-       read_lock(&pfkey_table_lock);
-       return seq_hlist_start_head(&net_pfkey->table, *ppos);
+       rcu_read_lock();
+       return seq_hlist_start_head_rcu(&net_pfkey->table, *ppos);
 }
 
 static void *pfkey_seq_next(struct seq_file *f, void *v, loff_t *ppos)
@@ -3708,12 +3669,12 @@ static void *pfkey_seq_next(struct seq_file *f, void *v, loff_t *ppos)
        struct net *net = seq_file_net(f);
        struct netns_pfkey *net_pfkey = net_generic(net, pfkey_net_id);
 
-       return seq_hlist_next(v, &net_pfkey->table, ppos);
+       return seq_hlist_next_rcu(v, &net_pfkey->table, ppos);
 }
 
 static void pfkey_seq_stop(struct seq_file *f, void *v)
 {
-       read_unlock(&pfkey_table_lock);
+       rcu_read_unlock();
 }
 
 static const struct seq_operations pfkey_seq_ops = {