From: wujianguo106@163.com To: mptcp@lists.linux.dev Cc: pabeni@redhat.com Subject: [PATCH 2/4] mptcp: remove redundant req destruct in subflow_check_req() Date: Fri, 11 Jun 2021 15:34:40 +0800 [thread overview] Message-ID: <1623396882-2748-3-git-send-email-wujianguo106@163.com> (raw) In-Reply-To: <1623396882-2748-1-git-send-email-wujianguo106@163.com> From: Jianguo Wu <wujianguo@chinatelecom.cn> In subflow_check_req(), if subflow sport is mismatch, will put msk, destroy token, and destruct req, then return -EPERM, which can be done by subflow_req_destructor() via: tcp_conn_request() |--__reqsk_free() |--subflow_req_destructor() So we should remove these redundant code, otherwise will call tcp_v4_reqsk_destructor() twice, and may double free inet_rsk(req)->ireq_opt. Fixes: 5bc56388c74f ("mptcp: add port number check for MP_JOIN") Signed-off-by: Jianguo Wu <wujianguo@chinatelecom.cn> --- net/mptcp/subflow.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 6b1cd42..75ed530 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -213,11 +213,6 @@ static int subflow_check_req(struct request_sock *req, ntohs(inet_sk(sk_listener)->inet_sport), ntohs(inet_sk((struct sock *)subflow_req->msk)->inet_sport)); if (!mptcp_pm_sport_in_anno_list(subflow_req->msk, sk_listener)) { - sock_put((struct sock *)subflow_req->msk); - mptcp_token_destroy_request(req); - tcp_request_sock_ops.destructor(req); - subflow_req->msk = NULL; - subflow_req->mp_join = 0; SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_MISMATCHPORTSYNRX); return -EPERM; } -- 1.8.3.1
next prev parent reply other threads:[~2021-06-11 7:35 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-11 7:34 [PATCH v3 0/4] Fix some mptcp syncookie process bugs wujianguo106 2021-06-11 7:34 ` [PATCH 1/4] mptcp: fix warning in __skb_flow_dissect() when do syn cookie for subflow join wujianguo106 2021-06-11 7:34 ` wujianguo106 [this message] 2021-06-11 7:34 ` [PATCH 3/4] mptcp: fix syncookie process if mptcp can not_accept new subflow wujianguo106 2021-06-11 7:34 ` [PATCH 4/4] mptcp: avoid processing packet if a subflow reset wujianguo106
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1623396882-2748-3-git-send-email-wujianguo106@163.com \ --to=wujianguo106@163.com \ --cc=mptcp@lists.linux.dev \ --cc=pabeni@redhat.com \ --subject='Re: [PATCH 2/4] mptcp: remove redundant req destruct in subflow_check_req()' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).