OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mptcp: fix lockless access in subflow ULP diag 

commit b8adb69a7d29c2d33eb327bca66476fb6066516b upstream.

Since the introduction of the subflow ULP diag interface, the
dump callback accessed all the subflow data with lockless.

We need either to annotate all the read and write operation accordingly,
or acquire the subflow socket lock. Let's do latter, even if slower, to
avoid a diffstat havoc.

Fixes: 5147dfb508 ("mptcp: allow dumping subflow context to userspace")
Cc: stable@vger.kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Paolo Abeni 2024-02-15 19:25:30 +01:00 committed by Greg Kroah-Hartman
parent 9e8e59af3a
commit 71787c665d
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/tcp.h
View File

@ -2290,7 +2290,7 @@ struct tcp_ulp_ops {
/* cleanup ulp */ /* cleanup ulp */
void (*release)(struct sock *sk); void (*release)(struct sock *sk);
/* diagnostic */ /* diagnostic */
int (*get_info)(const struct sock *sk, struct sk_buff *skb); int (*get_info)(struct sock *sk, struct sk_buff *skb);
size_t (*get_info_size)(const struct sock *sk); size_t (*get_info_size)(const struct sock *sk);
/* clone ulp */ /* clone ulp */
void (*clone)(const struct request_sock *req, struct sock *newsk, void (*clone)(const struct request_sock *req, struct sock *newsk,

6
net/mptcp/diag.c
View File

@ -13,17 +13,19 @@
#include <uapi/linux/mptcp.h> #include <uapi/linux/mptcp.h>
#include "protocol.h" #include "protocol.h"
static int subflow_get_info(const struct sock *sk, struct sk_buff *skb) static int subflow_get_info(struct sock *sk, struct sk_buff *skb)
{ {
struct mptcp_subflow_context *sf; struct mptcp_subflow_context *sf;
struct nlattr *start; struct nlattr *start;
u32 flags = 0; u32 flags = 0;
bool slow;
int err; int err;
start = nla_nest_start_noflag(skb, INET_ULP_INFO_MPTCP); start = nla_nest_start_noflag(skb, INET_ULP_INFO_MPTCP);
if (!start) if (!start)
return -EMSGSIZE; return -EMSGSIZE;
slow = lock_sock_fast(sk);
rcu_read_lock(); rcu_read_lock();
sf = rcu_dereference(inet_csk(sk)->icsk_ulp_data); sf = rcu_dereference(inet_csk(sk)->icsk_ulp_data);
if (!sf) { if (!sf) {
@ -69,11 +71,13 @@ static int subflow_get_info(const struct sock *sk, struct sk_buff *skb)
} }
rcu_read_unlock(); rcu_read_unlock();
unlock_sock_fast(sk, slow);
nla_nest_end(skb, start); nla_nest_end(skb, start);
return 0; return 0;
nla_failure: nla_failure:
rcu_read_unlock(); rcu_read_unlock();
unlock_sock_fast(sk, slow);
nla_nest_cancel(skb, start); nla_nest_cancel(skb, start);
return err; return err;
} }

2
net/tls/tls_main.c
View File

@ -1098,7 +1098,7 @@ static u16 tls_user_config(struct tls_context *ctx, bool tx)
return 0; return 0;
} }
static int tls_get_info(const struct sock *sk, struct sk_buff *skb) static int tls_get_info(struct sock *sk, struct sk_buff *skb)
{ {
u16 version, cipher_type; u16 version, cipher_type;
struct tls_context *ctx; struct tls_context *ctx;