Commit 2f1af441 authored by Jianguo Wu's avatar Jianguo Wu Committed by Jakub Kicinski
Browse files

mptcp: fix pr_debug in mptcp_token_new_connect 



After commit 2c5ebd00 ("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: 2c5ebd00 ("mptcp: refactor token container")
Acked-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarJianguo Wu <wujianguo@chinatelecom.cn>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent af9207ad

net/mptcp/token.c

+3 −3
Original line number Diff line number Diff line
@@ -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 @@ int mptcp_token_new_connect(struct sock *sk) 
		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++;