lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 424/800] mptcp: fix pr_debug in mptcp_token_new_connect
    Date
    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 8f0270a780ce..72a24e63b131 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


    \
     
     \ /
      Last update: 2021-07-12 10:36    [W:4.089 / U:0.360 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site