diff options
| author | Li RongQing <lirongqing@baidu.com> | 2019-02-22 17:08:22 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-24 12:37:23 -0800 |
| commit | c2f26e8f8788dbd911692d983a3ece83d7d66fbb (patch) | |
| tree | 881457ec92c33eb7d5f3d61d94a5b84975d98bff | |
| parent | b6a4119d9d01633d78409fed457fbe840c757f79 (diff) | |
| download | linux-c2f26e8f8788dbd911692d983a3ece83d7d66fbb.tar.gz linux-c2f26e8f8788dbd911692d983a3ece83d7d66fbb.tar.bz2 linux-c2f26e8f8788dbd911692d983a3ece83d7d66fbb.zip | |
net: Use RCU_INIT_POINTER() to set sk_wq
This pointer is RCU protected, so proper primitives should be used.
Signed-off-by: Zhang Yu <zhangyu31@baidu.com>
Signed-off-by: Li RongQing <lirongqing@baidu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/sock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index f4b8b78535f8..f5d82f3fa474 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1865,7 +1865,7 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority) */ sk_refcnt_debug_inc(newsk); sk_set_socket(newsk, NULL); - newsk->sk_wq = NULL; + RCU_INIT_POINTER(newsk->sk_wq, NULL); if (newsk->sk_prot->sockets_allocated) sk_sockets_allocated_inc(newsk); @@ -2828,11 +2828,11 @@ void sock_init_data(struct socket *sock, struct sock *sk) if (sock) { sk->sk_type = sock->type; - sk->sk_wq = sock->wq; + RCU_INIT_POINTER(sk->sk_wq, sock->wq); sock->sk = sk; sk->sk_uid = SOCK_INODE(sock)->i_uid; } else { - sk->sk_wq = NULL; + RCU_INIT_POINTER(sk->sk_wq, NULL); sk->sk_uid = make_kuid(sock_net(sk)->user_ns, 0); } |