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

sctp: add chunks to sk_backlog when the newsk sk_socket is not set

This patch is to fix a NULL-ptr deref in selinux_socket_connect_helper:

[...] kasan: GPF could be caused by NULL-ptr deref or user memory access
[...] RIP: 0010:selinux_socket_connect_helper+0x94/0x460
[...] Call Trace:
[...] selinux_sctp_bind_connect+0x16a/0x1d0
[...] security_sctp_bind_connect+0x58/0x90
[...] sctp_process_asconf+0xa52/0xfd0 [sctp]
[...] sctp_sf_do_asconf+0x785/0x980 [sctp]
[...] sctp_do_sm+0x175/0x5a0 [sctp]
[...] sctp_assoc_bh_rcv+0x285/0x5b0 [sctp]
[...] sctp_backlog_rcv+0x482/0x910 [sctp]
[...] __release_sock+0x11e/0x310
[...] release_sock+0x4f/0x180
[...] sctp_accept+0x3f9/0x5a0 [sctp]
[...] inet_accept+0xe7/0x720

It was caused by that the 'newsk' sk_socket was not set before going to
security sctp hook when processing asconf chunk with SCTP_PARAM_ADD_IP
or SCTP_PARAM_SET_PRIMARY:

inet_accept()->
sctp_accept():
lock_sock():
lock listening 'sk'
do_softirq():
sctp_rcv(): <-- [1]
asconf chunk arrives and
enqueued in 'sk' backlog
sctp_sock_migrate():
set asoc's sk to 'newsk'
release_sock():
sctp_backlog_rcv():
lock 'newsk'
sctp_process_asconf() <-- [2]
unlock 'newsk'
sock_graft():
set sk_socket <-- [3]

As it shows, at [1] the asconf chunk would be put into the listening 'sk'
backlog, as accept() was holding its sock lock. Then at [2] asconf would
get processed with 'newsk' as asoc's sk had been set to 'newsk'. However,
'newsk' sk_socket is not set until [3], while selinux_sctp_bind_connect()
would deref it, then kernel crashed.

Here to fix it by adding the chunk to sk_backlog until newsk sk_socket is
set when .accept() is done.

Note that sk->sk_socket can be NULL when the sock is closed, so SOCK_DEAD
flag is also needed to check in sctp_newsk_ready().

Thanks to Ondrej for reviewing the code.

Fixes: d452930fd3b9 ("selinux: Add SCTP support")
Reported-by: Ying Xu <yinxu@redhat.com>
Suggested-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>

authored by

Xin Long and committed by
Jakub Kicinski
819be810 a7137534

+14 -3
+5
include/net/sctp/sctp.h
··· 610 610 return sctp_mtu_payload(sp, SCTP_DEFAULT_MINSEGMENT, datasize); 611 611 } 612 612 613 + static inline bool sctp_newsk_ready(const struct sock *sk) 614 + { 615 + return sock_flag(sk, SOCK_DEAD) || sk->sk_socket; 616 + } 617 + 613 618 #endif /* __net_sctp_h__ */
+9 -3
net/sctp/input.c
··· 243 243 bh_lock_sock(sk); 244 244 } 245 245 246 - if (sock_owned_by_user(sk)) { 246 + if (sock_owned_by_user(sk) || !sctp_newsk_ready(sk)) { 247 247 if (sctp_add_backlog(sk, skb)) { 248 248 bh_unlock_sock(sk); 249 249 sctp_chunk_free(chunk); ··· 321 321 local_bh_disable(); 322 322 bh_lock_sock(sk); 323 323 324 - if (sock_owned_by_user(sk)) { 324 + if (sock_owned_by_user(sk) || !sctp_newsk_ready(sk)) { 325 325 if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) 326 326 sctp_chunk_free(chunk); 327 327 else ··· 336 336 if (backloged) 337 337 return 0; 338 338 } else { 339 - sctp_inq_push(inqueue, chunk); 339 + if (!sctp_newsk_ready(sk)) { 340 + if (!sk_add_backlog(sk, skb, sk->sk_rcvbuf)) 341 + return 0; 342 + sctp_chunk_free(chunk); 343 + } else { 344 + sctp_inq_push(inqueue, chunk); 345 + } 340 346 } 341 347 342 348 done: