Commit c2f26e8f authored by Li RongQing's avatar Li RongQing Committed by David S. Miller

net: Use RCU_INIT_POINTER() to set sk_wq

This pointer is RCU protected, so proper primitives should be used.
Signed-off-by: default avatarZhang Yu <zhangyu31@baidu.com>
Signed-off-by: default avatarLi RongQing <lirongqing@baidu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b6a4119d
...@@ -1865,7 +1865,7 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority) ...@@ -1865,7 +1865,7 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority)
*/ */
sk_refcnt_debug_inc(newsk); sk_refcnt_debug_inc(newsk);
sk_set_socket(newsk, NULL); sk_set_socket(newsk, NULL);
newsk->sk_wq = NULL; RCU_INIT_POINTER(newsk->sk_wq, NULL);
if (newsk->sk_prot->sockets_allocated) if (newsk->sk_prot->sockets_allocated)
sk_sockets_allocated_inc(newsk); sk_sockets_allocated_inc(newsk);
...@@ -2828,11 +2828,11 @@ void sock_init_data(struct socket *sock, struct sock *sk) ...@@ -2828,11 +2828,11 @@ void sock_init_data(struct socket *sock, struct sock *sk)
if (sock) { if (sock) {
sk->sk_type = sock->type; sk->sk_type = sock->type;
sk->sk_wq = sock->wq; RCU_INIT_POINTER(sk->sk_wq, sock->wq);
sock->sk = sk; sock->sk = sk;
sk->sk_uid = SOCK_INODE(sock)->i_uid; sk->sk_uid = SOCK_INODE(sock)->i_uid;
} else { } else {
sk->sk_wq = NULL; RCU_INIT_POINTER(sk->sk_wq, NULL);
sk->sk_uid = make_kuid(sock_net(sk)->user_ns, 0); sk->sk_uid = make_kuid(sock_net(sk)->user_ns, 0);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment