mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-24 04:34:08 +08:00
mptcp: fix lockless access in subflow ULP diag
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>
This commit is contained in:
parent
584f389426
commit
b8adb69a7d
@ -2506,7 +2506,7 @@ struct tcp_ulp_ops {
|
||||
/* cleanup ulp */
|
||||
void (*release)(struct sock *sk);
|
||||
/* 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);
|
||||
/* clone ulp */
|
||||
void (*clone)(const struct request_sock *req, struct sock *newsk,
|
||||
|
@ -13,17 +13,19 @@
|
||||
#include <uapi/linux/mptcp.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 nlattr *start;
|
||||
u32 flags = 0;
|
||||
bool slow;
|
||||
int err;
|
||||
|
||||
start = nla_nest_start_noflag(skb, INET_ULP_INFO_MPTCP);
|
||||
if (!start)
|
||||
return -EMSGSIZE;
|
||||
|
||||
slow = lock_sock_fast(sk);
|
||||
rcu_read_lock();
|
||||
sf = rcu_dereference(inet_csk(sk)->icsk_ulp_data);
|
||||
if (!sf) {
|
||||
@ -69,11 +71,13 @@ static int subflow_get_info(const struct sock *sk, struct sk_buff *skb)
|
||||
}
|
||||
|
||||
rcu_read_unlock();
|
||||
unlock_sock_fast(sk, slow);
|
||||
nla_nest_end(skb, start);
|
||||
return 0;
|
||||
|
||||
nla_failure:
|
||||
rcu_read_unlock();
|
||||
unlock_sock_fast(sk, slow);
|
||||
nla_nest_cancel(skb, start);
|
||||
return err;
|
||||
}
|
||||
|
@ -1003,7 +1003,7 @@ static u16 tls_user_config(struct tls_context *ctx, bool tx)
|
||||
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;
|
||||
struct tls_context *ctx;
|
||||
|
Loading…
Reference in New Issue
Block a user