Skip to content

Commit c1b5dee

Browse files
Paolo Abenigregkh
authored andcommitted
net/ulp: prevent ULP without clone op from entering the LISTEN status
[ Upstream commit 2c02d41 ] 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: Sasha Levin <[email protected]>
1 parent e0387f4 commit c1b5dee

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

net/ipv4/inet_connection_sock.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,12 +1037,26 @@ void inet_csk_prepare_forced_close(struct sock *sk)
10371037
}
10381038
EXPORT_SYMBOL(inet_csk_prepare_forced_close);
10391039

1040+
static int inet_ulp_can_listen(const struct sock *sk)
1041+
{
1042+
const struct inet_connection_sock *icsk = inet_csk(sk);
1043+
1044+
if (icsk->icsk_ulp_ops && !icsk->icsk_ulp_ops->clone)
1045+
return -EINVAL;
1046+
1047+
return 0;
1048+
}
1049+
10401050
int inet_csk_listen_start(struct sock *sk)
10411051
{
10421052
struct inet_connection_sock *icsk = inet_csk(sk);
10431053
struct inet_sock *inet = inet_sk(sk);
10441054
int err;
10451055

1056+
err = inet_ulp_can_listen(sk);
1057+
if (unlikely(err))
1058+
return err;
1059+
10461060
reqsk_queue_alloc(&icsk->icsk_accept_queue);
10471061

10481062
sk->sk_ack_backlog = 0;

net/ipv4/tcp_ulp.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,10 @@ static int __tcp_set_ulp(struct sock *sk, const struct tcp_ulp_ops *ulp_ops)
139139
if (sk->sk_socket)
140140
clear_bit(SOCK_SUPPORT_ZC, &sk->sk_socket->flags);
141141

142+
err = -EINVAL;
143+
if (!ulp_ops->clone && sk->sk_state == TCP_LISTEN)
144+
goto out_err;
145+
142146
err = ulp_ops->init(sk);
143147
if (err)
144148
goto out_err;

0 commit comments

Comments
 (0)