Skip to content

Commit c6d29a5

Browse files
Paolo Abenigregkh
authored andcommitted
net/ulp: prevent ULP without clone op from entering the LISTEN status
commit 2c02d41 upstream. When an ULP-enabled socket enters the LISTEN status, the listener ULP data pointer is copied inside the child/accepted sockets by sk_clone_lock(). The relevant ULP can take care of de-duplicating the context pointer via the clone() operation, but only MPTCP and SMC implement such op. Other ULPs may end-up with a double-free at socket disposal time. We can't simply clear the ULP data at clone time, as TLS replaces the socket ops with custom ones assuming a valid TLS ULP context is available. Instead completely prevent clone-less ULP sockets from entering the LISTEN status. Fixes: 734942c ("tcp: ULP infrastructure") Reported-by: slipper <[email protected]> Signed-off-by: Paolo Abeni <[email protected]> Link: https://lore.kernel.org/r/4b80c3d1dbe3d0ab072f80450c202d9bc88b4b03.1672740602.git.pabeni@redhat.com Signed-off-by: Jakub Kicinski <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent b318d41 commit c6d29a5

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

net/ipv4/inet_connection_sock.c

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -902,11 +902,25 @@ void inet_csk_prepare_forced_close(struct sock *sk)
902902
}
903903
EXPORT_SYMBOL(inet_csk_prepare_forced_close);
904904

905+
static int inet_ulp_can_listen(const struct sock *sk)
906+
{
907+
const struct inet_connection_sock *icsk = inet_csk(sk);
908+
909+
if (icsk->icsk_ulp_ops)
910+
return -EINVAL;
911+
912+
return 0;
913+
}
914+
905915
int inet_csk_listen_start(struct sock *sk, int backlog)
906916
{
907917
struct inet_connection_sock *icsk = inet_csk(sk);
908918
struct inet_sock *inet = inet_sk(sk);
909-
int err = -EADDRINUSE;
919+
int err;
920+
921+
err = inet_ulp_can_listen(sk);
922+
if (unlikely(err))
923+
return err;
910924

911925
reqsk_queue_alloc(&icsk->icsk_accept_queue);
912926

0 commit comments

Comments
 (0)