OSDN Git Service

mptcp: fix pr_debug in mptcp_token_new_connect
authorJianguo Wu <wujianguo@chinatelecom.cn>
Thu, 27 May 2021 23:54:24 +0000 (16:54 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 28 May 2021 20:59:15 +0000 (13:59 -0700)
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>
net/mptcp/token.c

index 8f0270a..72a24e6 100644 (file)
@@ -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++;