diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2023-08-11 17:57:16 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-08-14 07:06:13 +0100 |
| commit | cfb63e50d319ee5d11254c83d3ad2b135b8735db (patch) | |
| tree | 2a19373b019328107393261fcc59cfe03ae5425a /net/mptcp | |
| parent | ccae357c1c6a76c3b46f12ae18d7679d871c9390 (diff) | |
| download | linux-cfb63e50d319ee5d11254c83d3ad2b135b8735db.tar.gz | |
mptcp: avoid subflow socket usage in mptcp_get_port()
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>
Diffstat (limited to 'net/mptcp')
| -rw-r--r-- | net/mptcp/protocol.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index b888d6339c8051..891f49722263f4 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -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) |