| From bd6a97d3e79732a5c1ea64dd590c85f2cfec0e64 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 27 May 2021 16:54:24 -0700 |
| Subject: mptcp: fix pr_debug in mptcp_token_new_connect |
| |
| From: Jianguo Wu <wujianguo@chinatelecom.cn> |
| |
| [ Upstream commit 2f1af441fd5dd5caf0807bb19ce9bbf9325ce534 ] |
| |
| After commit 2c5ebd001d4f ("mptcp: refactor token container"), |
| pr_debug() is called before mptcp_crypto_key_gen_sha() in |
| mptcp_token_new_connect(), so the output local_key, token and |
| idsn are 0, like: |
| |
| MPTCP: ssk=00000000f6b3c4a2, local_key=0, token=0, idsn=0 |
| |
| Move pr_debug() after mptcp_crypto_key_gen_sha(). |
| |
| Fixes: 2c5ebd001d4f ("mptcp: refactor token container") |
| Acked-by: Paolo Abeni <pabeni@redhat.com> |
| Signed-off-by: Jianguo Wu <wujianguo@chinatelecom.cn> |
| Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com> |
| Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| net/mptcp/token.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/net/mptcp/token.c b/net/mptcp/token.c |
| index feb4b9ffd462..0691a4883f3a 100644 |
| --- a/net/mptcp/token.c |
| +++ b/net/mptcp/token.c |
| @@ -156,9 +156,6 @@ int mptcp_token_new_connect(struct sock *sk) |
| int retries = TOKEN_MAX_RETRIES; |
| struct token_bucket *bucket; |
| |
| - pr_debug("ssk=%p, local_key=%llu, token=%u, idsn=%llu\n", |
| - sk, subflow->local_key, subflow->token, subflow->idsn); |
| - |
| again: |
| mptcp_crypto_key_gen_sha(&subflow->local_key, &subflow->token, |
| &subflow->idsn); |
| @@ -172,6 +169,9 @@ again: |
| goto again; |
| } |
| |
| + pr_debug("ssk=%p, local_key=%llu, token=%u, idsn=%llu\n", |
| + sk, subflow->local_key, subflow->token, subflow->idsn); |
| + |
| WRITE_ONCE(msk->token, subflow->token); |
| __sk_nulls_add_node_rcu((struct sock *)msk, &bucket->msk_chain); |
| bucket->chain_len++; |
| -- |
| 2.30.2 |
| |