mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 18:09:57 +00:00
mptcp: fix data race around msk->first access
[ Upstream commit1b1b43ee7a
] The first subflow socket is accessed outside the msk socket lock by mptcp_subflow_fail(), we need to annotate each write access with WRITE_ONCE, but a few spots still lacks it. Fixes:76a13b3157
("mptcp: invoke MP_FAIL response when needed") Reviewed-by: Mat Martineau <martineau@kernel.org> Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Mat Martineau <martineau@kernel.org> Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
519f16d96c
commit
0b9e6d64cd
1 changed files with 3 additions and 3 deletions
|
@ -111,7 +111,7 @@ static int __mptcp_socket_create(struct mptcp_sock *msk)
|
|||
if (err)
|
||||
return err;
|
||||
|
||||
msk->first = ssock->sk;
|
||||
WRITE_ONCE(msk->first, ssock->sk);
|
||||
WRITE_ONCE(msk->subflow, ssock);
|
||||
subflow = mptcp_subflow_ctx(ssock->sk);
|
||||
list_add(&subflow->node, &msk->conn_list);
|
||||
|
@ -2405,7 +2405,7 @@ static void __mptcp_close_ssk(struct sock *sk, struct sock *ssk,
|
|||
sock_put(ssk);
|
||||
|
||||
if (ssk == msk->first)
|
||||
msk->first = NULL;
|
||||
WRITE_ONCE(msk->first, NULL);
|
||||
|
||||
out:
|
||||
if (ssk == msk->last_snd)
|
||||
|
@ -2706,7 +2706,7 @@ static int __mptcp_init_sock(struct sock *sk)
|
|||
WRITE_ONCE(msk->rmem_released, 0);
|
||||
msk->timer_ival = TCP_RTO_MIN;
|
||||
|
||||
msk->first = NULL;
|
||||
WRITE_ONCE(msk->first, NULL);
|
||||
inet_csk(sk)->icsk_sync_mss = mptcp_sync_mss;
|
||||
WRITE_ONCE(msk->csum_enabled, mptcp_is_checksum_enabled(sock_net(sk)));
|
||||
WRITE_ONCE(msk->allow_infinite_fallback, true);
|
||||
|
|
Loading…
Reference in a new issue