diff options
author | Eric Dumazet <edumazet@google.com> | 2015-11-29 20:03:11 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-12-01 15:45:05 -0500 |
commit | ceb5d58b217098a657f3850b7a2640f995032e62 (patch) | |
tree | 4d12375d4193b130ec15daac9acea099b7083544 /net/core/stream.c | |
parent | 9cd3e072b0be17446e37d7414eac8a3499e0601e (diff) | |
download | linux-stable-ceb5d58b217098a657f3850b7a2640f995032e62.tar.gz linux-stable-ceb5d58b217098a657f3850b7a2640f995032e62.tar.bz2 linux-stable-ceb5d58b217098a657f3850b7a2640f995032e62.zip |
net: fix sock_wake_async() rcu protection
Dmitry provided a syzkaller (http://github.com/google/syzkaller)
triggering a fault in sock_wake_async() when async IO is requested.
Said program stressed af_unix sockets, but the issue is generic
and should be addressed in core networking stack.
The problem is that by the time sock_wake_async() is called,
we should not access the @flags field of 'struct socket',
as the inode containing this socket might be freed without
further notice, and without RCU grace period.
We already maintain an RCU protected structure, "struct socket_wq"
so moving SOCKWQ_ASYNC_NOSPACE & SOCKWQ_ASYNC_WAITDATA into it
is the safe route.
It also reduces number of cache lines needing dirtying, so might
provide a performance improvement anyway.
In followup patches, we might move remaining flags (SOCK_NOSPACE,
SOCK_PASSCRED, SOCK_PASSSEC) to save 8 bytes and let 'struct socket'
being mostly read and let it being shared between cpus.
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/stream.c')
-rw-r--r-- | net/core/stream.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/stream.c b/net/core/stream.c index 43309428644d..b96f7a79e544 100644 --- a/net/core/stream.c +++ b/net/core/stream.c @@ -39,7 +39,7 @@ void sk_stream_write_space(struct sock *sk) wake_up_interruptible_poll(&wq->wait, POLLOUT | POLLWRNORM | POLLWRBAND); if (wq && wq->fasync_list && !(sk->sk_shutdown & SEND_SHUTDOWN)) - sock_wake_async(sock, SOCK_WAKE_SPACE, POLL_OUT); + sock_wake_async(wq, SOCK_WAKE_SPACE, POLL_OUT); rcu_read_unlock(); } } |