From patchwork Fri Mar 28 14:27:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 14032098 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 69BC51C4609; Fri, 28 Mar 2025 14:28:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743172090; cv=none; b=TTjjOmaPIo9UTHHYERxJfjQhqy7W2SkZZRbUsydLJU0yzC17relSKncRiSZddKupYAtCzoUJMpMR4oNuGTAEu7eCYIDCUWBOKP9nDtAWkjtTkOIac+NxH/GjIXhAjqMBUkloFY8PbUJgG0LdDuy0YQUM6OQwjf1CLlrFq3Qrebw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743172090; c=relaxed/simple; bh=awEuvFGtpL0MNDNIG1y3EbcEixXwlA0kAeb844a7YbY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YrxanjPBCTMx6ppCzDp189H9UEhePQRojcbzVy/daz+KOxqKdWJKZMwuXDj4bUCiAxmGzCrSijpVIfP0vXOwKrsOk64dDYJxMV1JxFhftSMi/I1Z+ghQ2sHj0fEQLM2BGp8PYvceOzrqEFsCQ3UWZRuljPPFZSJ/cm486X4ZGBw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YTFnvJ1N; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="YTFnvJ1N" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C708AC4CEED; Fri, 28 Mar 2025 14:28:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743172089; bh=awEuvFGtpL0MNDNIG1y3EbcEixXwlA0kAeb844a7YbY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=YTFnvJ1N0/b1vAO66PXbpqwCWYd66vqwf8s0Mt/SvS+Vqebc9zeBjcI+mSs5uFXto uUid1PpRifdHp403pB2SmWFVTeSySKXXACRDVctj5slzeRje6MfH5SfhWGbWEKjL7L J6Qjt5AtbNr0DeyD2RM0b+dbsI72SlZbj6XsMBmE+YzJGZHl6sHFG7/hg+ga1DfA06 0niXuXppnAoOBxU/uRBto9yF4Au5Mw6sGmjiOti49SUpKqBuu8fTtSTbtB+M4L7eLM iU4EV+dEJBiKEfGtyobhVJ/2gEiqKOcA+fOXznZMkX25xTmpVBh4fnwcb/5WiYui0W suYJ0Gq2w6CXg== From: "Matthieu Baerts (NGI0)" Date: Fri, 28 Mar 2025 15:27:16 +0100 Subject: [PATCH net 1/4] mptcp: fix NULL pointer in can_accept_new_subflow Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250328-net-mptcp-misc-fixes-6-15-v1-1-34161a482a7f@kernel.org> References: <20250328-net-mptcp-misc-fixes-6-15-v1-0-34161a482a7f@kernel.org> In-Reply-To: <20250328-net-mptcp-misc-fixes-6-15-v1-0-34161a482a7f@kernel.org> To: mptcp@lists.linux.dev, Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Florian Westphal , Shuah Khan , Dmytro Shytyi , Gang Yan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, "Matthieu Baerts (NGI0)" , stable@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3226; i=matttbe@kernel.org; h=from:subject:message-id; bh=vzugoolZfElAHOE2QlY156jFm2862QpuAvKqHC67q0k=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBn5rHs0x3onJRwijrAj23vtbDAMHIUqriAsYEgS 047nkrOm2yJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZ+ax7AAKCRD2t4JPQmmg cxXZD/9XVTwvr6jRlUHzXWoJXNFpjEmFoAmYtzGVtbJ/teyt5CkFX2DforBfX0FrLHRqqVGc6OO CqNKRSfHryPlAB+yHLlHp9rySZNpP7w5cxUdrTADFMc13pScKaDxXsEijArr8KtHZ6r0h6f4Cze TqEWXuHx7TbEj19yn/p51N2dL35akIBpay+ivcUe/C8qpLGYdedJvQKMHl2Mv3/IMaxAlsr38Kh AY/aLIr9HskeG0JMrdYRX2nhqATa+IjeLn4924XtQ1TZ0VnoP1E6ZJQiaNK8aLcouafchJ6ZpvC SMbMEO5nFR2fOFNTWoT5WLMC7+Oe/sUa6H8Og1nqcHg3QyUwMn/oNKb0BqEka5rowQ4bK31AH07 YDF++JUatOPc0Rlde9Uh2WGUTtYey/Oht6CMpUZeBa8p08qZ8Dr9iQFQU2NS4+8hvp2B2BZ5ar5 ghw5A65UaUWfK/7V6nB4a8Pk+CzUm48yQKPhIdEEAFG8UxmAAerOoApQzuBJow9v+1IqgeyIV/2 sX8bhfTY3Dw5a1OFSPAEK8tuECV6BMFmSoxDZYD3g0o9F9BXRd5ypHobX1Ru4fkGJ5/ZsRe7zH0 6tuWlRBfntB2u7uxxwNPNjfbHM6spiEZcb4eEpRyC+SQLfW35rTyspN8Hs7V2vIf1RMxsuRMRPo ORLlN7MWf6aFboA== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 X-Patchwork-Delegate: kuba@kernel.org From: Gang Yan When testing valkey benchmark tool with MPTCP, the kernel panics in 'mptcp_can_accept_new_subflow' because subflow_req->msk is NULL. Call trace: mptcp_can_accept_new_subflow (./net/mptcp/subflow.c:63 (discriminator 4)) (P) subflow_syn_recv_sock (./net/mptcp/subflow.c:854) tcp_check_req (./net/ipv4/tcp_minisocks.c:863) tcp_v4_rcv (./net/ipv4/tcp_ipv4.c:2268) ip_protocol_deliver_rcu (./net/ipv4/ip_input.c:207) ip_local_deliver_finish (./net/ipv4/ip_input.c:234) ip_local_deliver (./net/ipv4/ip_input.c:254) ip_rcv_finish (./net/ipv4/ip_input.c:449) ... According to the debug log, the same req received two SYN-ACK in a very short time, very likely because the client retransmits the syn ack due to multiple reasons. Even if the packets are transmitted with a relevant time interval, they can be processed by the server on different CPUs concurrently). The 'subflow_req->msk' ownership is transferred to the subflow the first, and there will be a risk of a null pointer dereference here. This patch fixes this issue by moving the 'subflow_req->msk' under the `own_req == true` conditional. Note that the !msk check in subflow_hmac_valid() can be dropped, because the same check already exists under the own_req mpj branch where the code has been moved to. Fixes: 9466a1ccebbe ("mptcp: enable JOIN requests even if cookies are in use") Cc: stable@vger.kernel.org Suggested-by: Paolo Abeni Signed-off-by: Gang Yan Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/subflow.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index efe8d86496dbd06a3c4cae6ffc6462e43e42c959..409bd415ef1d190d5599658d01323ad8c8a9be93 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -754,8 +754,6 @@ static bool subflow_hmac_valid(const struct request_sock *req, subflow_req = mptcp_subflow_rsk(req); msk = subflow_req->msk; - if (!msk) - return false; subflow_generate_hmac(READ_ONCE(msk->remote_key), READ_ONCE(msk->local_key), @@ -850,12 +848,8 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk, } else if (subflow_req->mp_join) { mptcp_get_options(skb, &mp_opt); - if (!(mp_opt.suboptions & OPTION_MPTCP_MPJ_ACK) || - !subflow_hmac_valid(req, &mp_opt) || - !mptcp_can_accept_new_subflow(subflow_req->msk)) { - SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_JOINACKMAC); + if (!(mp_opt.suboptions & OPTION_MPTCP_MPJ_ACK)) fallback = true; - } } create_child: @@ -905,6 +899,13 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk, goto dispose_child; } + if (!subflow_hmac_valid(req, &mp_opt) || + !mptcp_can_accept_new_subflow(subflow_req->msk)) { + SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_JOINACKMAC); + subflow_add_reset_reason(skb, MPTCP_RST_EPROHIBIT); + goto dispose_child; + } + /* move the msk reference ownership to the subflow */ subflow_req->msk = NULL; ctx->conn = (struct sock *)owner; From patchwork Fri Mar 28 14:27:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 14032099 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 65EC31C4A2D; Fri, 28 Mar 2025 14:28:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743172095; cv=none; b=nuwKvcue3dwHVTpGfPwWLRIWGBMUwg9h/ZhW5bhe13yk27qpIqNpmIES+1CtptCim22SyTBeVmNIVp2KPM3M5Az7pPY4ByU2z6xN52GIKsOCMmWCG0Ua0x8Fayb/loexhsRn6nznAnQKCedNMTvLtB1SDHM3XjlYrxDpk6Rr6VM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743172095; c=relaxed/simple; bh=UzzA5fAP2Dx0SztHOiKfMPXcl8apEI1hqtTzaMI+F/8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=R2cyHZtueOrPNPAAL8D+R7MIAcC0b3THQ3zqEf5wiye0T8fj6vMzi1U0YX94f6RQLdI0JcQi1TpWfv/UolUiE2baDfBortzAql7z3JIsAGF+EXcY3qxu5vv6yN+4oD5SyL8krlHIEvwlQveghC6fVof2ew6IUrzVx3rdTywLUmY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nggSPkdQ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="nggSPkdQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49E7BC4CEE4; Fri, 28 Mar 2025 14:28:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743172093; bh=UzzA5fAP2Dx0SztHOiKfMPXcl8apEI1hqtTzaMI+F/8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=nggSPkdQ0XpACcjJ+7ojDG4wsiDU5c9b9g5/LcPapFygTaCwu3larsnQkyJE3iDZA L0CVQyTWkBUETI2UEmkPZ3DClgP4EV8p9QhRIU7k/WwDT4KWb5iyF47DbScjdLKXlL +pZujubpFF3nvtmZkNg5jOH49A5ghb+Sif6pFKHG+5LrL+VwsbA+bjuO0Ehx4j1G6Q xxZRcs5rbNRGK+BIkxONGgGXKHXVnll0iUvJOeBbpUSd/MMPq+lxvpDzAUraT5i/bQ yyPmAq1CkrRUMlM55wQmZ8PgN5oGWpA64VLgNJFijyiCjrvZmAepSo41IkDM+8avaC 4f4wulcvnjY1g== From: "Matthieu Baerts (NGI0)" Date: Fri, 28 Mar 2025 15:27:17 +0100 Subject: [PATCH net 2/4] selftests: mptcp: fix incorrect fd checks in main_loop Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250328-net-mptcp-misc-fixes-6-15-v1-2-34161a482a7f@kernel.org> References: <20250328-net-mptcp-misc-fixes-6-15-v1-0-34161a482a7f@kernel.org> In-Reply-To: <20250328-net-mptcp-misc-fixes-6-15-v1-0-34161a482a7f@kernel.org> To: mptcp@lists.linux.dev, Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Florian Westphal , Shuah Khan , Dmytro Shytyi , Gang Yan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, "Matthieu Baerts (NGI0)" , Cong Liu , stable@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1533; i=matttbe@kernel.org; h=from:subject:message-id; bh=IA96LjQa8kXcVI3ABDI0xQDEyIBxJV4dvjuDH3s9p1M=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBn5rHsOowwUolVqffW3vZ5A9oAXqXLAfO72SP4v AF7T9ugrR6JAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZ+ax7AAKCRD2t4JPQmmg c81CD/9UQJIbICFRPFxRNPn7FMRv4T5Ng1tACi1BNyuEU5w7lt8/9gz+1ZZ+KE/ZcmkHC/fgTqD L8F1WNboFU5e+YZGmERBHM2APdPl8eTMW5Dpm6t5r6DbxllsJ8ggldBGRTCEwpzcuf9UWcrUWXy bkSBVx568SkTNsZPrLZidR4KAI4uUXtFAGNzdjxdQ+ooalAQ+ylOPPRTK2mzU7c3iL/EofhaO0N VgE/ccsBIq+PnTwZTxIGYxQz7Z2ULVsyObN+HejSBnNlOsEAh000srn/4Mca0GBJ86/cOVTE1jP UZN+Vyc0O84hGoxaRfgCeNG5p+QvP50xugkAAgcpwR33xascPXUMlrMmmZoAWo8AbygWy6qzKBh Py14sKuHEp6P1VNOMgOIwqPgjhiMrk7cBG3kiqPDMCXfiu8i8+8a7M6vdRRJ7wmXACIEaudxGVI Y5/fA4pVr43WHFcdM9x8k6ebsxoeaVsv4AcDoyNW32EXij+co7dU83teh2EmAg115otvyJQxr5o 4T+JuUQ6vsxTlnr2XQ+XLWfFsgY/ppPCdfywJIU32ZvlBDZt2h+bEm/xQ8u2i7WQ1caoh9vIUKK S3CHgdjye6FuIPWJWSk9AApZ4zcF5S7RzMJAaTDTPRbrcQyXjFMBfYL+PbCbNnt7GQlGixSnZuG iYeQJ72LnNPDjsA== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 X-Patchwork-Delegate: kuba@kernel.org From: Cong Liu Fix a bug where the code was checking the wrong file descriptors when opening the input files. The code was checking 'fd' instead of 'fd_in', which could lead to incorrect error handling. Fixes: 05be5e273c84 ("selftests: mptcp: add disconnect tests") Cc: stable@vger.kernel.org Fixes: ca7ae8916043 ("selftests: mptcp: mptfo Initiator/Listener") Co-developed-by: Geliang Tang Signed-off-by: Geliang Tang Signed-off-by: Cong Liu Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/mptcp_connect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/testing/selftests/net/mptcp/mptcp_connect.c index d240d02fa443a1cd802f0e705ab36db5c22063a8..893dc36b12f607bec56a41c9961eff272a7837c7 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c @@ -1270,7 +1270,7 @@ int main_loop(void) if (cfg_input && cfg_sockopt_types.mptfo) { fd_in = open(cfg_input, O_RDONLY); - if (fd < 0) + if (fd_in < 0) xerror("can't open %s:%d", cfg_input, errno); } @@ -1293,7 +1293,7 @@ int main_loop(void) if (cfg_input && !cfg_sockopt_types.mptfo) { fd_in = open(cfg_input, O_RDONLY); - if (fd < 0) + if (fd_in < 0) xerror("can't open %s:%d", cfg_input, errno); } From patchwork Fri Mar 28 14:27:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 14032100 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3DAA921C9EA; Fri, 28 Mar 2025 14:28:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743172098; cv=none; b=RFZt5AYi1jHSwBOi9HkRAgughSigZmPlepUa0wHAY+rM+wQnWaeNX8/xwQUDLQt0PC93EjtqppGtE/tLmBtcdOjzBd7zhh00bD3ovogkt2W6Gqt7QS9V2Wm+ggDd8qSQRJrc8pmz3AhGNw92ZKvLSOpBnlw3NFA9+dGx2Mqg3yY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743172098; c=relaxed/simple; bh=pR7ZsBtXGnaffvDzR3G0f+xtFYL/1NJWJsq/1XvaP14=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TttubRbLtcu7W9CKcrWHZLUxqC4stBw9M969mdqCFvT4fhGAZny4ykPsflGF43SMxOLGAx6Elu4nz0Arx5H4vOH5SV4DgGOOMNCSVBcaqqK6OFXqt5jHCY02F9VLqTusSxtJAeGgtLpJ3LoMMBGEXwxScRIDDXKEjWEIBEN4xuM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XOgJHHmH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XOgJHHmH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 32AACC4CEEA; Fri, 28 Mar 2025 14:28:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743172097; bh=pR7ZsBtXGnaffvDzR3G0f+xtFYL/1NJWJsq/1XvaP14=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=XOgJHHmHqS7/tfLxYg9SAp5uZMO2fkVPNFIBycOsswwoXPofe46AwJaWteldjBC0f KDpr5xj2PKw25vGwOH5445L7xWUi5c9PAKFN+7XnL7rzkQa0+hcphN36Xr7NsVN6ir L8f3N6G0+5zKJVGfinLdfszK/55goH+bAfOZ4T/1bF2YjVgTp0E3Vg//p3X8TYHmqn H1Wpfa1Ldfy4/ho5E6QgeVawjRmnAjQcRywlrgdCKfW0HZQW3QpUtnZp6E2vUa6QDo wXMD+ccmebSgJPgNR3RbZaSR1VS14Y7xCwLi6lG2QxKRmkJYWghooy+dj0oHmLg3DB VowqV7jyxk+YQ== From: "Matthieu Baerts (NGI0)" Date: Fri, 28 Mar 2025 15:27:18 +0100 Subject: [PATCH net 3/4] selftests: mptcp: close fd_in before returning in main_loop Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250328-net-mptcp-misc-fixes-6-15-v1-3-34161a482a7f@kernel.org> References: <20250328-net-mptcp-misc-fixes-6-15-v1-0-34161a482a7f@kernel.org> In-Reply-To: <20250328-net-mptcp-misc-fixes-6-15-v1-0-34161a482a7f@kernel.org> To: mptcp@lists.linux.dev, Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Florian Westphal , Shuah Khan , Dmytro Shytyi , Gang Yan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, "Matthieu Baerts (NGI0)" , stable@vger.kernel.org, Cong Liu , Geliang Tang X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1319; i=matttbe@kernel.org; h=from:subject:message-id; bh=BATmZiZuy/W/ffocjWue1jFUcQe06Xg/5usGzRn674w=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBn5rHsARxaxO00MS0AB6QHgVg6IwYBz4m0aRpHO vWjhh3OHcKJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZ+ax7AAKCRD2t4JPQmmg c9cKD/0RWsgah9b5ObqcTpttQVC8TRcZlz5IQMiEyoH25Ki7UTrez92SHxAgw4L5axK6J4R5YlZ kr5TnM5j3iqMmXc+mGRkSPJlkM8k4wCzdGuUX/kw8wkQ9y5kz7XNCGRj84P6rrmP5A2hpcSHNM/ ygZjtap6mSsBhIih8Apl0/KASYihnzBuqtpHpJIYS6Q7+wczHvpHx3KLYRo3UR/Hsq1GqzuPAKO RAVU0gIQZUBcWPGmVTgE7HvzV5kPkSeFQk9sS1TVLWaepESnrg4V0/BUKeCevKUE86uwg0vVNdh P0jd0L55nrCBrOSQeizvkrQKLUrlhlboJ9PglWCFhIEhxtSkfP38EfGE3u0Fp9fpaJUjJZIyR2r +Fv8EW32R4esU8srm++oqjR0MfP+X15tZdMM0FTCw7C8hhtpWTzofjrB/dHdya3vrJfj8FDDhDr 54QGX2mU9vwsUMj36syTUZNUGEWjFaxkTpic2TUmU3cdghVULjPP1Ubp2lxPts/PYTH1H4TxTn4 jYKkr4TohX8ZtfzdHYyuS6eAYzBBbogjaoNrgOW2Yr9O9BnuRdBiqtPN9pDoYLdhT3UDPiox5ns u9hiDhchLlF8jFdeK68K8Sfs0utVcFjulpDsl6leG4yFLpDc1An0vgoBdRtEdT6glHKRG5V7HKb 8yPlYVO/iXSpihw== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 X-Patchwork-Delegate: kuba@kernel.org From: Geliang Tang The file descriptor 'fd_in' is opened when cfg_input is configured, but not closed in main_loop(), this patch fixes it. Fixes: 05be5e273c84 ("selftests: mptcp: add disconnect tests") Cc: stable@vger.kernel.org Co-developed-by: Cong Liu Signed-off-by: Cong Liu Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/mptcp_connect.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/testing/selftests/net/mptcp/mptcp_connect.c index 893dc36b12f607bec56a41c9961eff272a7837c7..c83a8b47bbdfa5fcf1462e2b2949b41fd32c9b14 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c @@ -1299,7 +1299,7 @@ int main_loop(void) ret = copyfd_io(fd_in, fd, 1, 0, &winfo); if (ret) - return ret; + goto out; if (cfg_truncate > 0) { shutdown(fd, SHUT_WR); @@ -1320,7 +1320,10 @@ int main_loop(void) close(fd); } - return 0; +out: + if (cfg_input) + close(fd_in); + return ret; } int parse_proto(const char *proto) From patchwork Fri Mar 28 14:27:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 14032101 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AF5391B4F15; Fri, 28 Mar 2025 14:28:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743172101; cv=none; b=MQiGUKdMprmTIKAhjO7pFMM8nAtbk/eQV6Tz810jiqX/Un3yKgA2D2EsDrz7Kp8blQUPPFemzzwRqplWd5HCGWUXU8rRPGeZ8p93+h/6anCqxwvIRlWNApz3SpoKE7Kw7eAvHIfKlTSnOGqzPIBzeQFr0uBB1KGzxEN9bYvvcTw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743172101; c=relaxed/simple; bh=huDQ4vgkjBwI5c/TpdXiJlPetTIhi7oSTen6uASUw+U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KG1hPLDCnOu/maB5FuV7SWZjP5krDDYtgyg5AuQilmB4KK1jz3NsC4IYAmSLuyZaVzEglJH5IeE116sNkNo/iEvoiRTncBE4vYLxKrz2MRCOuGlYXfmuL7kUgL0am4qMtZXoHkikVIoX3vBJwg7Pt1JHlI5GkF4+cY1EvrDNueA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dyzKF0JW; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dyzKF0JW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19E21C4CEE4; Fri, 28 Mar 2025 14:28:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743172101; bh=huDQ4vgkjBwI5c/TpdXiJlPetTIhi7oSTen6uASUw+U=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=dyzKF0JWikCnB7HKrZmFCk8Lt8Xl5jWowejSsDXyvTQY20oDL5WTHBrdr6Sft3Nce vJQ8XqJgTXlavz8pvc66yAv+1WcvrDPpYoFUuGETOCi9PFX19Z8oACMvCaqSup3bEl m1JTyXzxPybWHqGp3EABD2QOSGzb1m5IkhnqYLX2hv3wjz2K0XLAWKPcuxH5WKy4XZ ZGMpAVk6zSEc8fHzSZzygxipCE1N0/e7bym5RGsD0ZYvUCtu6k6R0ZXdWA5ef7tBf7 kazpM5gowIeu6p79ZEheauedQjC5tKfFXbLLbx9yZ+p/MHTO0J08XqaBZ997eTSgZE Phed4UQc3x9aA== From: "Matthieu Baerts (NGI0)" Date: Fri, 28 Mar 2025 15:27:19 +0100 Subject: [PATCH net 4/4] selftests: mptcp: ignore mptcp_diag binary Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250328-net-mptcp-misc-fixes-6-15-v1-4-34161a482a7f@kernel.org> References: <20250328-net-mptcp-misc-fixes-6-15-v1-0-34161a482a7f@kernel.org> In-Reply-To: <20250328-net-mptcp-misc-fixes-6-15-v1-0-34161a482a7f@kernel.org> To: mptcp@lists.linux.dev, Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Florian Westphal , Shuah Khan , Dmytro Shytyi , Gang Yan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, "Matthieu Baerts (NGI0)" X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=917; i=matttbe@kernel.org; h=from:subject:message-id; bh=huDQ4vgkjBwI5c/TpdXiJlPetTIhi7oSTen6uASUw+U=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBn5rHsXJqxAQ434DU1KAL3sueAHT0ICgCs3bYA3 4HFIxsYT2iJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZ+ax7AAKCRD2t4JPQmmg c+dSD/sFlsNkJp+W+2zDwXFLCWl+ajZ0L4vgRRzfGH2xBdnYTk5wYHDKGPwKDgiIDQRtIzoqL69 cGJ6JAvyP27k5jQYPaqfUEULi94nLo1blElJ9O7DWdS3AN4I75VpnHQmjOBb37v4hIms9cswdoo Hj9mAtFZULR3xvit5tnogDmyV+XJmNA6J0JKjgum1vMyfoBp2VzP2CXZ0U/0HNZb3+hOYui+7Kc mZJkzAyja8QN1BEW/xaq1Mc1GkDqy1qPQjRl4LD4SnD3FEXcD+6DHekcNwAOX/R9ypfYAiVPcyy sV8cvcEWYurC8BJb1LEXd3tCEWPgCaVDpYx/qfLF824v1K2CqspFHnNkHLMazGjNH7Laaa7P+aF /YcCotYwoBECyxZpMfFxzWfw2FddEyyzkLidgk82ApL12fdH9gvTqGugW+LFtUprQKhZ6Snaar7 rWgXeLhARzFW0B/sNKVr4fHQpLa6ntBQByS+3oIb4C31mJMi5Seu0E7RPiOReLSWDAUkc+M/guC dZpLz3fqFj84NbWg2bYkBsHmKA/cIenDiogJsFfnPYOCp8+GQnRweM8YsJ8S6LSRziNAIqD7rca FDgvd0FbrnIIBb/idFzImFsRGiIbS/juo2E/DJogiMHPtcNu4kcF1Ed31rBSyQqlRBRl4Hnlcad UwdOHwvmVmAkBCQ== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 X-Patchwork-Delegate: kuba@kernel.org A new binary is now generated by the MPTCP selftests: mptcp_diag. Like the other binaries from this directory, there is no need to track this in Git, it should then be ignored. Fixes: 00f5e338cf7e ("selftests: mptcp: Add a tool to get specific msk_info") Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/net/mptcp/.gitignore b/tools/testing/selftests/net/mptcp/.gitignore index 49daae73c41e6f86c6f0e47aa42426e5ad5c17e6..833279fb34e2dd74a27f16c26e44108029dd45e1 100644 --- a/tools/testing/selftests/net/mptcp/.gitignore +++ b/tools/testing/selftests/net/mptcp/.gitignore @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only mptcp_connect +mptcp_diag mptcp_inq mptcp_sockopt pm_nl_ctl