From patchwork Thu May 2 17:23:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthieu Baerts (NGI0)" X-Patchwork-Id: 13651925 X-Patchwork-Delegate: matthieu.baerts@tessares.net 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 7306116FF2A for ; Thu, 2 May 2024 17:23:19 +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=1714670599; cv=none; b=nAf1FOIh3UiUwF4OWI2ZsrczShuHedWcaGnFq1A6Qu1W8ddS30s0+LlFGfLj1lGyr4YioIFxG3Ek7x3/PC2pxViE4sKlAEmOS333EfLrl1WAbmDlwOaJtssl9KGU1jLJeNzBZtmSJ0f4ArYGcgM55I5HhSkRweQGMzNDi4dRA4A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714670599; c=relaxed/simple; bh=bMiCs/gqGEJkKIh2cpuKospUiWHyYgh2mjYUnA4KrTw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=R0ylwHmBEGVOiDGXCVdljfxfGfP6kHzu8akGcDNFrkwiCMj/FwjtFw6QwcQWzf1b7ooge/+KjgNlYGyceQbQ4FWIsdQ5rPSGTd5lHZspfcKqnU7/xorUmsdNlE0fjLCo6AsfH98bFhl7TkKvXDdtHy47cTgTRaWD9HJd8qCsl+4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eh4Jnkdw; 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="eh4Jnkdw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87D55C4AF18; Thu, 2 May 2024 17:23:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714670599; bh=bMiCs/gqGEJkKIh2cpuKospUiWHyYgh2mjYUnA4KrTw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=eh4JnkdwSwQ86g3GJdQ6V1W0mnTAGFnD/vkHhO+jeeVGAZ3sLKcP8I0Bv91KpXZvW wKIZC0h0WXGTzrteRAM0mfMmHkm7TAVSxYBozhxq7VcFT9nauCOMaASVCTcOLdTH/p lUyReFtUjqDdG9m+XGeNzS/q05w5coK2p7h0gH446jDjkZilw563o6yyO05FsVJovG 3tAzJFjiIGJd0zRtt1vc7DBNIAyF+Ik7N3pMCGzon4Ms2vWfXwoOKQgQPmkFE+xjlK sJ+LpGP7BsuqaKYdZFtjF+gh/jqEfj+b7riCA3hXRKHJ0xWTUItDBnkSh6g01jGwkA F6Kq5RUWRs/kw== From: "Matthieu Baerts (NGI0)" Date: Thu, 02 May 2024 19:23:04 +0200 Subject: [PATCH mptcp-next 1/4] mptcp: prefer strscpy over strcpy Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240502-mptcp-cleanup-clang-checkpatch-v1-1-a2b46c0a6bec@kernel.org> References: <20240502-mptcp-cleanup-clang-checkpatch-v1-0-a2b46c0a6bec@kernel.org> In-Reply-To: <20240502-mptcp-cleanup-clang-checkpatch-v1-0-a2b46c0a6bec@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2616; i=matttbe@kernel.org; h=from:subject:message-id; bh=bMiCs/gqGEJkKIh2cpuKospUiWHyYgh2mjYUnA4KrTw=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmM8wE4GQ8rYki2F9gZq7f4t/gm5pDo8MG9m1b+ Ax9MWYdBLWJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZjPMBAAKCRD2t4JPQmmg c0uUEACWCBLbeu2bwDW+fvwIvFFgscixhSnCk0cb+y3T2n6wDVHhr9lEjIZ0A/kARyEU6lyNfCJ swgJ7HPkUL30k1i76Dib2d6f4h6zlwqnOj8gWKV2jbi9pyJv5EISnjbUnQ0koKSesDe4AUyCS4d JxY6+aWEbzX3AoHSm9rjCpfqP7IeEJSQ96czGSYqxSouxjPzlQcHh7r/mJu2UAfa5Ajyyo7w6G+ BHGlIRTsNIbCyWPv+E4vNGkVi1q13pIoWJewihv9d/qCvsP6k/T5lyaCWa4PcJriGngwCcXd05F vqQl8/d2tdEuuRVJiQjc9nqIs0lS/qpgvH3hk8evAqswbrUq2D2Hyx9hZVlgk38VbCZEUuRg8SB 4bPz7Daa8Ie48SrY7yD7T8+0jcfp0So6p/pelfwYkhNX+ArjvVNgMIlRhQj2Z7TpIxJOEyrg8Ea U5SmV37F9Kc3kSbh9coOwuf0RzivmQVXC09fbHK1WkgMG4+tRAR/9f6rIA2t9WDi5jdK/HVCQJf MhUWLDZbW5QrtYWnqKWxX0aJDrPr6ABO4OQjsG9BekwtEPWa1eNB9KT+lGquvA71Zl8rwA1vR/X NjV2Rj2EkNJfaguNcB231kvtnJJmzGGf9GxGGr5FTXilq6vCmawPpmj1as2Q1p/7+4qxw1aYN9h nHcpDMh4RAFBt4w== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 strcpy() performs no bounds checking on the destination buffer. This could result in linear overflows beyond the end of the buffer, leading to all kinds of misbehaviors. The safe replacement is strscpy() [1]. This is in preparation of a possible future step where all strcpy() uses will be removed in favour of strscpy() [2]. This fixes CheckPatch warnings: WARNING: Prefer strscpy over strcpy Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strcpy [1] Link: https://github.com/KSPP/linux/issues/88 [2] Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/ctrl.c | 2 +- net/mptcp/protocol.c | 5 +++-- net/mptcp/sockopt.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c index 8d661156ab8c..3d9d26b29bcd 100644 --- a/net/mptcp/ctrl.c +++ b/net/mptcp/ctrl.c @@ -92,7 +92,7 @@ static void mptcp_pernet_set_defaults(struct mptcp_pernet *pernet) pernet->allow_join_initial_addr_port = 1; pernet->stale_loss_cnt = 4; pernet->pm_type = MPTCP_PM_TYPE_KERNEL; - strcpy(pernet->scheduler, "default"); + strscpy(pernet->scheduler, "default", sizeof(pernet->scheduler)); } #ifdef CONFIG_SYSCTL diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 62403f93c4d7..579031c60937 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2814,7 +2814,8 @@ static void mptcp_ca_reset(struct sock *sk) struct inet_connection_sock *icsk = inet_csk(sk); tcp_assign_congestion_control(sk); - strcpy(mptcp_sk(sk)->ca_name, icsk->icsk_ca_ops->name); + strscpy(mptcp_sk(sk)->ca_name, icsk->icsk_ca_ops->name, + sizeof(mptcp_sk(sk)->ca_name)); /* no need to keep a reference to the ops, the name will suffice */ tcp_cleanup_congestion_control(sk); @@ -4169,7 +4170,7 @@ int __init mptcp_proto_v6_init(void) int err; mptcp_v6_prot = mptcp_prot; - strcpy(mptcp_v6_prot.name, "MPTCPv6"); + strscpy(mptcp_v6_prot.name, "MPTCPv6", sizeof(mptcp_v6_prot.name)); mptcp_v6_prot.slab = NULL; mptcp_v6_prot.obj_size = sizeof(struct mptcp6_sock); mptcp_v6_prot.ipv6_pinfo_offset = offsetof(struct mptcp6_sock, np); diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index b0d1dc4df0c1..2edaf1a16005 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -618,7 +618,7 @@ static int mptcp_setsockopt_sol_tcp_congestion(struct mptcp_sock *msk, sockptr_t } if (ret == 0) - strcpy(msk->ca_name, name); + strscpy(msk->ca_name, name, sizeof(msk->ca_name)); release_sock(sk); return ret; From patchwork Thu May 2 17:23:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthieu Baerts (NGI0)" X-Patchwork-Id: 13651926 X-Patchwork-Delegate: matthieu.baerts@tessares.net 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 7F62C16FF2A for ; Thu, 2 May 2024 17:23:20 +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=1714670600; cv=none; b=JlTzJIzB9TWb2xiju5jV7Ez+szoX+7el0uY5iBNts22BFKm20es6tFfEfrB9V0nifVaKcjh+8t0tRlIdrAPszCkdC+N8d8pVRNaMKCi7XbCBkNKtOZGKA9ZMV8nDhVK7AWYORrcPZAd7KNSPeHrZbpxI0OwKJKfmhHqeAbFKCsU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714670600; c=relaxed/simple; bh=mvvlH2m409VuiWYpIh3M8K3HaWJsVPp30WQFQLduJ3M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FlL/L2di/epaGfYSnSAY1s5IBfWHzjf36cG6yjcupiVCADgErNE5lX02tarhcqNVZGjb2WuGMJRxVVgBAxyXhcZXue8COaD4Pz2Hu/F/cVsmFqJ+FrCslLYxTLfJjcTncwTwf9y0WM6pXJEHjqQxKtVNX+4wK4g9xRn0GsJ9msY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=T3WZZSKr; 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="T3WZZSKr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8B0DAC4AF14; Thu, 2 May 2024 17:23:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714670600; bh=mvvlH2m409VuiWYpIh3M8K3HaWJsVPp30WQFQLduJ3M=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=T3WZZSKrDBTHDCVylZWPyg2l77aDxwC3heiyR+NLLWALB5JSzh2XnMzWzKeDkBvMn fxZyI19aKaPtYQV9OM/bliwu3y3SVCN+m86OerUlgt5nirm958BtDsAHJQjy5epZdl oJjV4PCifJo0SlsaAyz1wkr3kU+szW0vFwrumgSb33sFbvG+qXuqmJse0r7TOZ0Aef ucfGlyV32nlgK4HnVqscnlF0S8sOYHwDlBygbjzPQJtupABv6sdOJ5KSm4zhk+0P30 yL3xOJll2o8aLRP/r6IuEf1nspZMuEh3kk2HSgbDyQIsroll0LLZb3+XIedvU5fkC4 jh5KIsDUIcoGQ== From: "Matthieu Baerts (NGI0)" Date: Thu, 02 May 2024 19:23:05 +0200 Subject: [PATCH mptcp-next 2/4] mptcp: move mptcp_pm_gen.h's include Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240502-mptcp-cleanup-clang-checkpatch-v1-2-a2b46c0a6bec@kernel.org> References: <20240502-mptcp-cleanup-clang-checkpatch-v1-0-a2b46c0a6bec@kernel.org> In-Reply-To: <20240502-mptcp-cleanup-clang-checkpatch-v1-0-a2b46c0a6bec@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1390; i=matttbe@kernel.org; h=from:subject:message-id; bh=mvvlH2m409VuiWYpIh3M8K3HaWJsVPp30WQFQLduJ3M=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmM8wEQwv/bdXEl8+Yzrn4ljpVK/xiP+guMkY9c WYWqNG+u+SJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZjPMBAAKCRD2t4JPQmmg c0YVEADopF8iPQDeEGObtphjr7Jl15jZNGIiR43a/ildnBob7YBwf8OAAU8vnQF//TV2OAjhy0u +yL3e1tzhskdhyPAweJRCdB3o6+RLWRYDiTk1KWwG/WOeyioLotPpTdumSDZdPXTV+W909/Nj44 cu0du9Mt8zE18EX/KHH95jjP/xWgjvT0l1Xwv2d3ihXKAj8P5hCFWyq4NMXNF5IubxBiaKZA4DQ C3UgJM0JXVbOU/oHaX00BjFN3WWfZetbf5b40JUGh/wp9fy8R1jphxg5YFMj3fgKVWIPlvYpTL3 i9f48YEdSnungbtfKp4uXp9EkFBbBU6SaIM00PaprgYY/1UvEBRtJL00agkRx/6XNZh796sEO2k yrDUxq+pCM86DWwVB4mE6KXNKdDLJn/vP0/FnpT0PPfE8ebbn1lcW/Jb6J8VttTZqlUOeYfuw4I c0bFcWldG2qclnaBgdB8e+v7inT648JSfvH9DlaAK+XNSx8xBFw+VgD2mfWZpJKYIRbxxunbZHw 1GhhH86nAGz0KYHH1fll7r6jrCvMg0L7TEoQen05xU9fM+vBENGMyFXICERTvNj35PteKZUYQ3x N3FC233CtW8RQ4XLhieE9MFWp4yIhkDMzu/Ni2DcoUZN8rKNodvFN8mkNYIrt6G0Nh/HZmPLXhy VsKUYj5iqBYXlZA== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Nothing from protocol.h depends on mptcp_pm_gen.h, only code from pm_netlink.c and pm_userspace.c depends on it. So this include can be moved where it is needed to avoid a "unused includes" warning. Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/pm_netlink.c | 1 + net/mptcp/pm_userspace.c | 1 + net/mptcp/protocol.h | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 5c17d39146ea..7f53e022e27e 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -14,6 +14,7 @@ #include "protocol.h" #include "mib.h" +#include "mptcp_pm_gen.h" static int pm_nl_pernet_id; diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 9f5d422d5ef6..f0a4590506c6 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -6,6 +6,7 @@ #include "protocol.h" #include "mib.h" +#include "mptcp_pm_gen.h" void mptcp_free_local_addr_list(struct mptcp_sock *msk) { diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index ffd00fb45433..2d40629e8231 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -14,8 +14,6 @@ #include #include -#include "mptcp_pm_gen.h" - #define MPTCP_SUPPORTED_VERSION 1 /* MPTCP option bits */ From patchwork Thu May 2 17:23:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthieu Baerts (NGI0)" X-Patchwork-Id: 13651927 X-Patchwork-Delegate: matthieu.baerts@tessares.net 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 8578A16D4C0 for ; Thu, 2 May 2024 17:23: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=1714670601; cv=none; b=jwrhBpVHtxn42ZbbpjVZ8HaQ7uLaswkU/GQoZRdAU7z3n/eiZDs0CkvWE0hv9I+KeOcmRCWhvIqaWI8v0o3FslZ4ZOZOQ5cb9MGDbSOd+KP4tieRcnaVY+9Vcd4j3rqcwU0mc9J6JKP7H7yQJ2QzFfx5sd5jAfMWNPb5cM2wkM0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714670601; c=relaxed/simple; bh=Ttit8Sj0t88KyvcChT4U9PjIkI9d4LUsr0a9dNeF7Fo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=t8qFVHc72/AOEfdIXhkclkaGZhnzau5DZQe1tTzYgl3THnVst6+e5f5ZHB8AfEDEKtVbHEdOxU2z6Xhu2ZnYOJCVlYNCzaoGjI0+IpsehP4vb4mOi6zneJWQ+z+a8XfUEwLDpEEGc1NpSNQNWQ0uejLNaLwnpikebxLkJstTAxo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JtjRTEuT; 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="JtjRTEuT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8DD27C116B1; Thu, 2 May 2024 17:23:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714670601; bh=Ttit8Sj0t88KyvcChT4U9PjIkI9d4LUsr0a9dNeF7Fo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=JtjRTEuT4UHeegiqzSMq56+rdivLf68Qkjud0KuiPKCwyTnhwVAjfngurVJ3AgfLU geDRREupBQih1lF8iIcDGLZrPYA5qdbJmforZ/o97hyzB8rMePGf8hB5UwP8SYtWBk 42Rl7MRJCrpUwi4sq0FFnff8TlvIqBdPIEQ/+IWSYx1lGTWAUaujjIRdevY3I5+VWS JHc5U2QSKpvUd9Sl9Er0paC6Zf4GIgpsPcQFvOdCd+nZIyt/lHq68hhdklG4SZWR4Z 1vWcFB/g9nYfNga2eGOdNcoZ8XOXPqwAJVoBXnmTDSUzobRep4q5Mjt4dIvzPLQtXc ZovA605eopmSQ== From: "Matthieu Baerts (NGI0)" Date: Thu, 02 May 2024 19:23:06 +0200 Subject: [PATCH mptcp-next 3/4] mptcp: remove unnecessary else statements Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240502-mptcp-cleanup-clang-checkpatch-v1-3-a2b46c0a6bec@kernel.org> References: <20240502-mptcp-cleanup-clang-checkpatch-v1-0-a2b46c0a6bec@kernel.org> In-Reply-To: <20240502-mptcp-cleanup-clang-checkpatch-v1-0-a2b46c0a6bec@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2084; i=matttbe@kernel.org; h=from:subject:message-id; bh=Ttit8Sj0t88KyvcChT4U9PjIkI9d4LUsr0a9dNeF7Fo=; b=owEBbAKT/ZANAwAIAfa3gk9CaaBzAcsmYgBmM8wFhQfm0HmgQcs5iHOkJRwXK0TM7ao+WAjVw hdU+icbWZWJAjIEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZjPMBQAKCRD2t4JPQmmg c6qSD/iqnMTV0w50t0q+ucGnxrVTGwerEkPvrMeL5SFaft7wb0lVxHBo+Xd9cYftzKZvCvqtVvq xITxt3mUmEPz2Wva+T/my5Qa8AETwJzKW5V7wPzGDrf6XLNWMhwAf7llDO+r58/uOsjpmpVxdrT ix3Z5OULUoeHJZ4WlAo5G67gns9uh68x0rYA55YZgjtT9P3yIkkltxdS6DMfE3UWHvt5CZilWQD E6+f2kSZlQBg7Cz9sizxd1Uezoi/ax+9gK1ukTeND4Vu7Fl/ouWfa47xhaMf7SoFo/L22cdYgOc 9dzMbbR1IGPVt5kUg8zW9uMhcPU0Rt9F5e6AMN+yiq/YH/G2s+v9qDxHsra8g9VnsCemcCiYLWW 7aRB645y+Iot+KbmNPVF4mfTH2WmownliQJH5TrYlqpoKKqBkwDJ4bhbXw02dtzEp5VvRCK1eow sEuj78T5voQPX6eknMUkz8fvOOGuz52pMRSz56aR1JTeL88Ix4/YS5KR+zaEwKYktVPEzeSke8P ZxTQwLSNZWkD4sUylU2HFgk/FqL7I14OPFzVMTbcgp028we7ql1Sf89D0bc015qjBOlgz7Iigg2 mQ3JJNWGEDM7ViLtm3OvqMWFD1fMp4HbJjT4MZARQ94tcPx8BYCbf0dbTND7mMo2UsVCO2dSKgf HKQ7ObLaw7HOb X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 The 'else' statements are not needed here, because their previous 'if' block ends with a 'return'. This fixes CheckPatch warnings: WARNING: else is not generally useful after a break or return Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/subflow.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 97ec44d1df30..7987342f4526 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1117,6 +1117,8 @@ static enum mapping_status get_mapping_status(struct sock *ssk, } if (mpext->data_fin == 1) { + u64 data_fin_seq; + if (data_len == 1) { bool updated = mptcp_update_rcv_data_fin(msk, mpext->data_seq, mpext->dsn64); @@ -1129,26 +1131,26 @@ static enum mapping_status get_mapping_status(struct sock *ssk, */ skb_ext_del(skb, SKB_EXT_MPTCP); return MAPPING_OK; - } else { - if (updated) - mptcp_schedule_work((struct sock *)msk); - - return MAPPING_DATA_FIN; } - } else { - u64 data_fin_seq = mpext->data_seq + data_len - 1; - /* If mpext->data_seq is a 32-bit value, data_fin_seq - * must also be limited to 32 bits. - */ - if (!mpext->dsn64) - data_fin_seq &= GENMASK_ULL(31, 0); + if (updated) + mptcp_schedule_work((struct sock *)msk); - mptcp_update_rcv_data_fin(msk, data_fin_seq, mpext->dsn64); - pr_debug("DATA_FIN with mapping seq=%llu dsn64=%d", - data_fin_seq, mpext->dsn64); + return MAPPING_DATA_FIN; } + data_fin_seq = mpext->data_seq + data_len - 1; + + /* If mpext->data_seq is a 32-bit value, data_fin_seq must also + * be limited to 32 bits. + */ + if (!mpext->dsn64) + data_fin_seq &= GENMASK_ULL(31, 0); + + mptcp_update_rcv_data_fin(msk, data_fin_seq, mpext->dsn64); + pr_debug("DATA_FIN with mapping seq=%llu dsn64=%d", + data_fin_seq, mpext->dsn64); + /* Adjust for DATA_FIN using 1 byte of sequence space */ data_len--; } From patchwork Thu May 2 17:23:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthieu Baerts (NGI0)" X-Patchwork-Id: 13651928 X-Patchwork-Delegate: matthieu.baerts@tessares.net 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 933AD16D4C0 for ; Thu, 2 May 2024 17:23:22 +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=1714670602; cv=none; b=NkCNAWaNf6mQrCZ7ahAWXHwuAVJ6c0g4vgdLXJLBa5XkTgGuQj71oeTC4Y5hQHH01U3KwmaVlH3wC2nPoV/wW2Ld6VLnnOV4mfpKlaFelSxp4gGszRjHcR/EDULsyYEuB5QXe7QM8FrVEfpqk1tLrmpb25yOOKP1rBrzJVloKaQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714670602; c=relaxed/simple; bh=Pr5ut1WESNJZen6Dt6M0oQNjb4+oqdOMnUxX1VhHtOI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sIRTqlnf2Aav8qrDkslQSd9UuaA+2m9HM45014rUqNebJBQGpQTb5R0u0j1Ffm7yaP+9rEAQYCb9s7lsQ7bW78EDY0z3EPGmsO/voPK8wfTxjecS96+LVFbs7BNGG/e6b2yEkVibYntndOhmKB+4FMvc1hsx0B/NMGUKSteLEIA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PdvgXlvk; 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="PdvgXlvk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 930D9C113CC; Thu, 2 May 2024 17:23:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714670602; bh=Pr5ut1WESNJZen6Dt6M0oQNjb4+oqdOMnUxX1VhHtOI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=PdvgXlvkXCzh8YbnzrzUY6rk2Ze9VX/nRmLYNb0e9Kd0QaF0aIDzER/EgefWsaxd1 pvRWsNu3AuyPzoql80xV6kgGxvQX5hoNEaj5ozIGJG5XQZzKOYrzIcvFP7dBkJF8GT 5tW0yu3Y+l5P6C8aLVhE0OTwPUwaxUrAplbaVhYUzdU1KnEgBlnrh3aJz0+Jip4bMq P/DF9W1NL+CrXzVGrVzV8dE6jaUBEdFnzHKETKgTzaHbwOoM4msrd4et/9pT2jenBR r9KfGhwKwZlF4di8aL6ApsvFr2Yr0Dv7Qa9zXin2CTnQi80browJXLpFZxs6TaoGlM hbspRFIluWXxg== From: "Matthieu Baerts (NGI0)" Date: Thu, 02 May 2024 19:23:07 +0200 Subject: [PATCH mptcp-next 4/4] mptcp: include inet_common in mib.h Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240502-mptcp-cleanup-clang-checkpatch-v1-4-a2b46c0a6bec@kernel.org> References: <20240502-mptcp-cleanup-clang-checkpatch-v1-0-a2b46c0a6bec@kernel.org> In-Reply-To: <20240502-mptcp-cleanup-clang-checkpatch-v1-0-a2b46c0a6bec@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=585; i=matttbe@kernel.org; h=from:subject:message-id; bh=Pr5ut1WESNJZen6Dt6M0oQNjb4+oqdOMnUxX1VhHtOI=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmM8wFtosGB9MLa6t1EG6yDa0wxKyfrxauvch7E +ePFwRuaTGJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZjPMBQAKCRD2t4JPQmmg c9FKD/0ay9gpdi8C6FJ/oI2S2Nc+h1+Yih+Kg6JawIpig7YbUQ4t9bZu7dmLI1BUKxnIiJwzSQL x/1mdF4Ah1j8Ju8fcDTj769bxJK7zz88R4oGNYaDZZapKwQ1HPK+dCRflTG1AGezNeyF8hMrKXw cG4I8k1TEnLDt45HcjQotGhUa3LrwmE94V5n/XH7q10Gycx/JGrfQVm9XQQqdZ4fTQxAPIcswhf DvpcD5MLUCDPW3XaDBqJJYRtFZLcpWvDzmKPAYhC3QedkLdfBEgdciogWR3dNsCDgXwJhav6Tpq gBcgpIuCFqmQCmJhD+URrmFBwnfCZd7C31huBdTxELhFFutQZVbOKJFmhh4kUKwjrtMd1lbsMKz 4mylsM8V9tLz0FOhxNs9kigdpVcSSIxx8nE33+/v+MrGNKowOcBxX5LA9KsOX2i/khloWYV/cWC 1A0H2KYha5q/m9fYt7hws3A/LAcDlQBcMkzsO7fEshV1vsrFV2tnNxspWhXmgu39qOhlkkkxsdr iRC2tKw98SQI/EadgdCAeaN2em1vhq8d5xyZZyB3iUERBwte1WNHhKxxmVlZ7yk5b+f2igFkg2/ ny6IqU39BlXk1UTBgQ4jO4roBp5in2Q452pfnUVv2+yNxMLYXtGKUN9di1HdO2uK5lnPxARU/Vb ob8pfGBSUEx/hrA== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 So this file is now self-contained: it can be compiled alone with analytic tools. Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/mib.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/mptcp/mib.h b/net/mptcp/mib.h index dd7fd1f246b5..2704afd0dfe4 100644 --- a/net/mptcp/mib.h +++ b/net/mptcp/mib.h @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +#include + enum linux_mptcp_mib_field { MPTCP_MIB_NUM = 0, MPTCP_MIB_MPCAPABLEPASSIVE, /* Received SYN with MP_CAPABLE */