diff options
| author | Mark Salyzyn <salyzyn@android.com> | 2015-05-26 17:22:19 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-27 05:19:29 +0200 |
| commit | b48732e4a48d80ed4a14812f0bab09560846514e (patch) | |
| tree | 979d5c6257fe181758030d4a9d52a257c328cf9a /net/caif/caif_socket.c | |
| parent | amd-xgbe-phy: Fix initial mode when autoneg is disabled (diff) | |
| download | linux-b48732e4a48d80ed4a14812f0bab09560846514e.tar.xz linux-b48732e4a48d80ed4a14812f0bab09560846514e.zip | |
unix/caif: sk_socket can disappear when state is unlocked
got a rare NULL pointer dereference in clear_bit
Signed-off-by: Mark Salyzyn <salyzyn@android.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
----
v2: switch to sock_flag(sk, SOCK_DEAD) and added net/caif/caif_socket.c
v3: return -ECONNRESET in upstream caller of wait function for SOCK_DEAD
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/caif/caif_socket.c')
| -rw-r--r-- | net/caif/caif_socket.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c index 4ec0c803aef1..112ad784838a 100644 --- a/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c @@ -330,6 +330,10 @@ static long caif_stream_data_wait(struct sock *sk, long timeo) release_sock(sk); timeo = schedule_timeout(timeo); lock_sock(sk); + + if (sock_flag(sk, SOCK_DEAD)) + break; + clear_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags); } @@ -373,6 +377,10 @@ static int caif_stream_recvmsg(struct socket *sock, struct msghdr *msg, struct sk_buff *skb; lock_sock(sk); + if (sock_flag(sk, SOCK_DEAD)) { + err = -ECONNRESET; + goto unlock; + } skb = skb_dequeue(&sk->sk_receive_queue); caif_check_flow_release(sk); |