Skip to content

[fips-legacy-8] net/ulp: prevent ULP without clone op from entering the LISTEN status #393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmastbergen merged 2 commits into from
Jul 3, 2025
Merged

[fips-legacy-8] net/ulp: prevent ULP without clone op from entering the LISTEN status #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f16d9e8
net/ulp: prevent ULP without clone op from entering the LISTEN status
bmastbergen Jul 1, 2025
25bb22c
net/ulp: use consistent error code when blocking ULP
bmastbergen Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions net/ipv4/inet_connection_sock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,12 +900,27 @@ void inet_csk_prepare_forced_close(struct sock *sk)
}
EXPORT_SYMBOL(inet_csk_prepare_forced_close);

static int inet_ulp_can_listen(const struct sock *sk)
{
const struct inet_connection_sock *icsk = inet_csk(sk);

if (icsk->icsk_ulp_ops && !icsk->icsk_ulp_ops->clone)
return -EINVAL;

return 0;
}

int inet_csk_listen_start(struct sock *sk, int backlog)
{
struct inet_connection_sock *icsk = inet_csk(sk);
struct inet_sock *inet = inet_sk(sk);
int err = -EADDRINUSE;

err = inet_ulp_can_listen(sk);
if (unlikely(err))
return err;

err = -EADDRINUSE;
reqsk_queue_alloc(&icsk->icsk_accept_queue);

sk->sk_ack_backlog = 0;
Expand Down
4 changes: 4 additions & 0 deletions net/ipv4/tcp_ulp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@ static int __tcp_set_ulp(struct sock *sk, const struct tcp_ulp_ops *ulp_ops)
if (icsk->icsk_ulp_ops)
goto out_err;

err = -ENOTCONN;
if (!ulp_ops->clone && sk->sk_state == TCP_LISTEN)
goto out_err;

err = ulp_ops->init(sk);
if (err)
goto out_err;
Expand Down