+++ /dev/null
-From 2c02d41d71f90a5168391b6a5f2954112ba2307c Mon Sep 17 00:00:00 2001
-From: Paolo Abeni <pabeni@redhat.com>
-Date: Tue, 3 Jan 2023 12:19:17 +0100
-Subject: net/ulp: prevent ULP without clone op from entering the LISTEN status
-
-From: Paolo Abeni <pabeni@redhat.com>
-
-commit 2c02d41d71f90a5168391b6a5f2954112ba2307c 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: 734942cc4ea6 ("tcp: ULP infrastructure")
-Reported-by: slipper <slipper.alive@gmail.com>
-Signed-off-by: Paolo Abeni <pabeni@redhat.com>
-Link: https://lore.kernel.org/r/4b80c3d1dbe3d0ab072f80450c202d9bc88b4b03.1672740602.git.pabeni@redhat.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/ipv4/inet_connection_sock.c | 16 +++++++++++++++-
- net/ipv4/tcp_ulp.c | 4 ++++
- 2 files changed, 19 insertions(+), 1 deletion(-)
-
---- a/net/ipv4/inet_connection_sock.c
-+++ b/net/ipv4/inet_connection_sock.c
-@@ -894,11 +894,25 @@ void inet_csk_prepare_forced_close(struc
- }
- 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;
-+ int err;
-+
-+ err = inet_ulp_can_listen(sk);
-+ if (unlikely(err))
-+ return err;
-
- reqsk_queue_alloc(&icsk->icsk_accept_queue);
-
---- a/net/ipv4/tcp_ulp.c
-+++ b/net/ipv4/tcp_ulp.c
-@@ -124,6 +124,10 @@ int tcp_set_ulp(struct sock *sk, const c
- if (!ulp_ops)
- return -ENOENT;
-
-+ err = -EINVAL;
-+ if (!ulp_ops->clone && sk->sk_state == TCP_LISTEN)
-+ goto out_err;
-+
- err = ulp_ops->init(sk);
- if (err) {
- module_put(ulp_ops->owner);
driver-core-fix-bus_type.match-error-handling-in-__driver_attach.patch
ravb-fix-failed-to-switch-device-to-config-mode-message-during-unbind.patch
net-sched-disallow-noqueue-for-qdisc-classes.patch
-net-ulp-prevent-ulp-without-clone-op-from-entering-the-listen-status.patch
+++ /dev/null
-From 2c02d41d71f90a5168391b6a5f2954112ba2307c Mon Sep 17 00:00:00 2001
-From: Paolo Abeni <pabeni@redhat.com>
-Date: Tue, 3 Jan 2023 12:19:17 +0100
-Subject: net/ulp: prevent ULP without clone op from entering the LISTEN status
-
-From: Paolo Abeni <pabeni@redhat.com>
-
-commit 2c02d41d71f90a5168391b6a5f2954112ba2307c 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: 734942cc4ea6 ("tcp: ULP infrastructure")
-Reported-by: slipper <slipper.alive@gmail.com>
-Signed-off-by: Paolo Abeni <pabeni@redhat.com>
-Link: https://lore.kernel.org/r/4b80c3d1dbe3d0ab072f80450c202d9bc88b4b03.1672740602.git.pabeni@redhat.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/ipv4/inet_connection_sock.c | 16 +++++++++++++++-
- net/ipv4/tcp_ulp.c | 4 ++++
- 2 files changed, 19 insertions(+), 1 deletion(-)
-
---- a/net/ipv4/inet_connection_sock.c
-+++ b/net/ipv4/inet_connection_sock.c
-@@ -903,11 +903,25 @@ void inet_csk_prepare_forced_close(struc
- }
- 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;
-+ int err;
-+
-+ err = inet_ulp_can_listen(sk);
-+ if (unlikely(err))
-+ return err;
-
- reqsk_queue_alloc(&icsk->icsk_accept_queue);
-
---- a/net/ipv4/tcp_ulp.c
-+++ b/net/ipv4/tcp_ulp.c
-@@ -152,6 +152,10 @@ int tcp_set_ulp(struct sock *sk, const c
- return -ENOENT;
- }
-
-+ err = -EINVAL;
-+ if (!ulp_ops->clone && sk->sk_state == TCP_LISTEN)
-+ goto out_err;
-+
- err = ulp_ops->init(sk);
- if (err) {
- module_put(ulp_ops->owner);
parisc-align-parisc-madv_xxx-constants-with-all-other-architectures.patch
driver-core-fix-bus_type.match-error-handling-in-__driver_attach.patch
net-sched-disallow-noqueue-for-qdisc-classes.patch
-net-ulp-prevent-ulp-without-clone-op-from-entering-the-listen-status.patch
+++ /dev/null
-From 2c02d41d71f90a5168391b6a5f2954112ba2307c Mon Sep 17 00:00:00 2001
-From: Paolo Abeni <pabeni@redhat.com>
-Date: Tue, 3 Jan 2023 12:19:17 +0100
-Subject: net/ulp: prevent ULP without clone op from entering the LISTEN status
-
-From: Paolo Abeni <pabeni@redhat.com>
-
-commit 2c02d41d71f90a5168391b6a5f2954112ba2307c 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: 734942cc4ea6 ("tcp: ULP infrastructure")
-Reported-by: slipper <slipper.alive@gmail.com>
-Signed-off-by: Paolo Abeni <pabeni@redhat.com>
-Link: https://lore.kernel.org/r/4b80c3d1dbe3d0ab072f80450c202d9bc88b4b03.1672740602.git.pabeni@redhat.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/ipv4/inet_connection_sock.c | 16 +++++++++++++++-
- net/ipv4/tcp_ulp.c | 4 ++++
- 2 files changed, 19 insertions(+), 1 deletion(-)
-
---- a/net/ipv4/inet_connection_sock.c
-+++ b/net/ipv4/inet_connection_sock.c
-@@ -902,11 +902,25 @@ void inet_csk_prepare_forced_close(struc
- }
- 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;
-+ int err;
-+
-+ err = inet_ulp_can_listen(sk);
-+ if (unlikely(err))
-+ return err;
-
- reqsk_queue_alloc(&icsk->icsk_accept_queue);
-
---- a/net/ipv4/tcp_ulp.c
-+++ b/net/ipv4/tcp_ulp.c
-@@ -138,6 +138,10 @@ static int __tcp_set_ulp(struct sock *sk
- if (icsk->icsk_ulp_ops)
- goto out_err;
-
-+ err = -EINVAL;
-+ if (!ulp_ops->clone && sk->sk_state == TCP_LISTEN)
-+ goto out_err;
-+
- err = ulp_ops->init(sk);
- if (err)
- goto out_err;
selftests-set-the-build-variable-to-absolute-path.patch
driver-core-fix-bus_type.match-error-handling-in-__driver_attach.patch
net-sched-disallow-noqueue-for-qdisc-classes.patch
-net-ulp-prevent-ulp-without-clone-op-from-entering-the-listen-status.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
