Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-06 05:06:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mptcp: avoid subflow socket usage in mptcp_get_port()

Browse Source 
We are going to remove the first subflow socket soon, so avoid
accessing it in mptcp_get_port(). Instead, access directly the
first subflow sock.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Paolo Abeni 2023-08-11 17:57:16 +02:00 committed by David S. Miller
parent ccae357c1c
commit cfb63e50d3
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/mptcp/protocol.c
View File

@ -3405,14 +3405,12 @@ static void mptcp_unhash(struct sock *sk)
static int mptcp_get_port(struct sock *sk, unsigned short snum)
{
struct mptcp_sock *msk = mptcp_sk(sk);
struct socket *ssock;
ssock = msk->subflow;
pr_debug("msk=%p, subflow=%p", msk, ssock);
if (WARN_ON_ONCE(!ssock))
pr_debug("msk=%p, ssk=%p", msk, msk->first);
if (WARN_ON_ONCE(!msk->first))
return -EINVAL;
return inet_csk_get_port(ssock->sk, snum);
return inet_csk_get_port(msk->first, snum);
}
void mptcp_finish_connect(struct sock *ssk)