Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b48732e4 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by David S. Miller
Browse files

unix/caif: sk_socket can disappear when state is unlocked 



got a rare NULL pointer dereference in clear_bit

Signed-off-by: default avatarMark Salyzyn <salyzyn@android.com>
Acked-by: default avatarHannes 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: default avatarDavid S. Miller <davem@davemloft.net>
parent 983942a5

net/caif/caif_socket.c

+8 −0
Original line number Diff line number Diff line
@@ -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);

net/unix/af_unix.c

+8 −0
Original line number Diff line number Diff line
@@ -1880,6 +1880,10 @@ static long unix_stream_data_wait(struct sock *sk, long timeo, 
		unix_state_unlock(sk);

		timeo = freezable_schedule_timeout(timeo);

		unix_state_lock(sk);



		if (sock_flag(sk, SOCK_DEAD))

			break;



		clear_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags);

	}
@@ -1939,6 +1943,10 @@ static int unix_stream_recvmsg(struct socket *sock, struct msghdr *msg, 
		struct sk_buff *skb, *last;



		unix_state_lock(sk);

		if (sock_flag(sk, SOCK_DEAD)) {

			err = -ECONNRESET;

			goto unlock;

		}

		last = skb = skb_peek(&sk->sk_receive_queue);

again:

		if (skb == NULL) {