Skip to content

Commit 0fd4c51

Browse files
author
Paolo Abeni
committed
net/ulp: prevent ULP without clone op from entering the LISTEN status
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2162758 Tested: tls self-tests Upstream commit: commit 2c02d41 Author: Paolo Abeni <[email protected]> Date: Tue Jan 3 12:19:17 2023 +0100 net/ulp: prevent ULP without clone op from entering the LISTEN status 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: Paolo Abeni <[email protected]>
1 parent dc71649 commit 0fd4c51

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
@@ -1040,12 +1040,26 @@ void inet_csk_prepare_forced_close(struct sock *sk)
10401040
}
10411041
EXPORT_SYMBOL(inet_csk_prepare_forced_close);
10421042

1043+
static int inet_ulp_can_listen(const struct sock *sk)
1044+
{
1045+
const struct inet_connection_sock *icsk = inet_csk(sk);
1046+
1047+
if (icsk->icsk_ulp_ops && !icsk->icsk_ulp_ops->clone)
1048+
return -EINVAL;
1049+
1050+
return 0;
1051+
}
1052+
10431053
int inet_csk_listen_start(struct sock *sk, int backlog)
10441054
{
10451055
struct inet_connection_sock *icsk = inet_csk(sk);
10461056
struct inet_sock *inet = inet_sk(sk);
10471057
int err = -EADDRINUSE;
10481058

1059+
err = inet_ulp_can_listen(sk);
1060+
if (unlikely(err))
1061+
return err;
1062+
10491063
reqsk_queue_alloc(&icsk->icsk_accept_queue);
10501064

10511065
sk->sk_ack_backlog = 0;

net/ipv4/tcp_ulp.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@ static int __tcp_set_ulp(struct sock *sk, const struct tcp_ulp_ops *ulp_ops)
136136
if (icsk->icsk_ulp_ops)
137137
goto out_err;
138138

139+
err = -EINVAL;
140+
if (!ulp_ops->clone && sk->sk_state == TCP_LISTEN)
141+
goto out_err;
142+
139143
err = ulp_ops->init(sk);
140144
if (err)
141145
goto out_err;

0 commit comments

Comments
 (0)