diff options
| author | Florian Westphal <fw@strlen.de> | 2021-09-23 17:04:11 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-09-24 10:51:36 +0100 |
| commit | ea1300b9df7c8e8b65695a08b8f6aaf4b25fec9c (patch) | |
| tree | f43dbc42ad77111069190f44356c68ca7260f4ff /net/mptcp/token.c | |
| parent | f7e745f8e94492a8ac0b0a26e25f2b19d342918f (diff) | |
| download | linux-stable-ea1300b9df7c8e8b65695a08b8f6aaf4b25fec9c.tar.gz linux-stable-ea1300b9df7c8e8b65695a08b8f6aaf4b25fec9c.tar.bz2 linux-stable-ea1300b9df7c8e8b65695a08b8f6aaf4b25fec9c.zip | |
mptcp: don't return sockets in foreign netns
mptcp_token_get_sock() may return a mptcp socket that is in
a different net namespace than the socket that received the token value.
The mptcp syncookie code path had an explicit check for this,
this moves the test into mptcp_token_get_sock() function.
Eventually token.c should be converted to pernet storage, but
such change is not suitable for net tree.
Fixes: 2c5ebd001d4f0 ("mptcp: refactor token container")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mptcp/token.c')
| -rw-r--r-- | net/mptcp/token.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/net/mptcp/token.c b/net/mptcp/token.c index a98e554b034f..e581b341c5be 100644 --- a/net/mptcp/token.c +++ b/net/mptcp/token.c @@ -231,6 +231,7 @@ found: /** * mptcp_token_get_sock - retrieve mptcp connection sock using its token + * @net: restrict to this namespace * @token: token of the mptcp connection to retrieve * * This function returns the mptcp connection structure with the given token. @@ -238,7 +239,7 @@ found: * * returns NULL if no connection with the given token value exists. */ -struct mptcp_sock *mptcp_token_get_sock(u32 token) +struct mptcp_sock *mptcp_token_get_sock(struct net *net, u32 token) { struct hlist_nulls_node *pos; struct token_bucket *bucket; @@ -251,11 +252,15 @@ struct mptcp_sock *mptcp_token_get_sock(u32 token) again: sk_nulls_for_each_rcu(sk, pos, &bucket->msk_chain) { msk = mptcp_sk(sk); - if (READ_ONCE(msk->token) != token) + if (READ_ONCE(msk->token) != token || + !net_eq(sock_net(sk), net)) continue; + if (!refcount_inc_not_zero(&sk->sk_refcnt)) goto not_found; - if (READ_ONCE(msk->token) != token) { + + if (READ_ONCE(msk->token) != token || + !net_eq(sock_net(sk), net)) { sock_put(sk); goto again; } |