Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Mark Salyzyn and committed by
David S. Miller
b48732e4 983942a5

+16
+8
net/caif/caif_socket.c
··· 330 330 release_sock(sk); 331 331 timeo = schedule_timeout(timeo); 332 332 lock_sock(sk); 333 + 334 + if (sock_flag(sk, SOCK_DEAD)) 335 + break; 336 + 333 337 clear_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags); 334 338 } 335 339 ··· 377 373 struct sk_buff *skb; 378 374 379 375 lock_sock(sk); 376 + if (sock_flag(sk, SOCK_DEAD)) { 377 + err = -ECONNRESET; 378 + goto unlock; 379 + } 380 380 skb = skb_dequeue(&sk->sk_receive_queue); 381 381 caif_check_flow_release(sk); 382 382
+8
net/unix/af_unix.c
··· 1880 1880 unix_state_unlock(sk); 1881 1881 timeo = freezable_schedule_timeout(timeo); 1882 1882 unix_state_lock(sk); 1883 + 1884 + if (sock_flag(sk, SOCK_DEAD)) 1885 + break; 1886 + 1883 1887 clear_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags); 1884 1888 } 1885 1889 ··· 1943 1939 struct sk_buff *skb, *last; 1944 1940 1945 1941 unix_state_lock(sk); 1942 + if (sock_flag(sk, SOCK_DEAD)) { 1943 + err = -ECONNRESET; 1944 + goto unlock; 1945 + } 1946 1946 last = skb = skb_peek(&sk->sk_receive_queue); 1947 1947 again: 1948 1948 if (skb == NULL) {