From nobody Fri May 3 06:53:48 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:84cc:0:0:0:0:0 with SMTP id f70csp589929jai; Thu, 20 Jan 2022 23:39:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJygb68206KHcNfbh1g4AdQnrXAo1RqVMMIQp4SgwRojn+ncmlMH/sF77ZHL0QcapVJxfVKi X-Received: by 2002:a37:a006:: with SMTP id j6mr1828243qke.11.1642750781325; Thu, 20 Jan 2022 23:39:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642750781; cv=none; d=google.com; s=arc-20160816; b=crYTW7amMu3It4Q5weiOFCT5IOBjpHAIG+t4TQmWYEoVZuyy9beqZ3ontsVJF0joIH GatJ2TPL6ejemRjyh/axB2w8dQndu+eoWF2mbVdTBZnb8ArInEuJwGVuIC++0S+D8HAk 2DFP159Ue/ZSCBC7Ezh8jPDnVB4TCgZPnXSba9EuIp01aYGY1QeMkfTjpgUXJZ5qh2gS jxmyvSeuWTNhMwdzO3fr1LaJ5ynfhfLEtuwx553rdD7viFD+iyb2OVLFP8/0IkSAKb56 oQXjXd25b9zOS6kbnikoy+BZgKCMcmte17x6ZmU7qy7AoRZ0u7qT+9dtKKhMXlOlmzKU 3sFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=J/KI/DDN8T1ayErpxnQiZZ4iJShjEoYH/kl3zkOkoNM=; b=ab256xQkcInwgS9Ej0uQ2Og3sdf/seTFzdBDq403ObAzY7aYNr5p2UxWQ6AALlEg0f ZcaKKeNcrSoJLc+3yo70L4H88ulLrXl849EGpu9ROhwq5gA8KHcql9QcLneYmyG5ppx1 1DMlYfi6iJbWErh+xW0jBZhPOkEPlJDyJBnArltj9TuW0j7uNwM+ng6c54g4D6q8tDNt qvZfbqz2TQmgKyHQLaLAeYf/Iv1mBtIX9hqpQxfw53UtUwbKqhFvbjMqYcsNlJT53Uco gtTsUCC+7ubIvI0f35N77YDkYhfXPfZMB9xM/yIfruQp14bEvOQOj2D17VILJUHXUM87 4vkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=NMy5ZakH; spf=pass (google.com: domain of mptcp+bounces-3274-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3274-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id i2si2082778qvh.1.2022.01.20.23.39.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jan 2022 23:39:41 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3274-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=NMy5ZakH; spf=pass (google.com: domain of mptcp+bounces-3274-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3274-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ewr.edge.kernel.org (Postfix) with ESMTPS id 0CDA41C070F for ; Fri, 21 Jan 2022 07:39:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 86BBF2CA7; Fri, 21 Jan 2022 07:39:39 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6EFF129CA for ; Fri, 21 Jan 2022 07:39:38 +0000 (UTC) Received: by mail-pj1-f49.google.com with SMTP id pf13so8671454pjb.0 for ; Thu, 20 Jan 2022 23:39:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=J/KI/DDN8T1ayErpxnQiZZ4iJShjEoYH/kl3zkOkoNM=; b=NMy5ZakHpoNnM2tGCEPIZUk5eQaDDt7d6UOXJA9Bkot8hQ8cwZWFw7AHkVV7w45aj/ fooKSMsoNkTHHIHkKH0gBuFJR16x7IRrQdjuhm91pTk/A5qOnoOf9sp84fc88zCe0sb5 s/V282A3oyIuK5gVHLmNNOitYm0EbJ0ffVyPM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=J/KI/DDN8T1ayErpxnQiZZ4iJShjEoYH/kl3zkOkoNM=; b=hERPRui/iUmaeLnNcM9xUT34OAZjiuIzO23uR51Kb1kPpN7Jq5qk0Ymrn5ubX8V5qK 8jQpIjEhKLMuJ7EWI0fZSdSxBvbzGCS7F3VaJV7HvvgKbhJHov2XcwyB8ebojxeOoGY6 ZhlwEJKqlWEqlAxDMmCZ7BFij3SlRxksVcIl3qVQCRtLjEGYPvz16P/pjBX3oivCfJZo /n2eAYliEq5TSCy08Xhs/Wfva/nQh1m6vYVZ6O3nxPzi1qvY2AM780470KQdKRF/RFQD 3X71KO7+Ml5xwx449jg5ylh6QfdNi0lL2BNYbeo3DIfBbqgOQ/XzFXIvl98dmYh855bm mnXw== X-Gm-Message-State: AOAM532hErMnO/TLLpJtz0qshM+79FC+fWhoBc/fC5BaV4Fo8zYgCGVw AwGOW2eR8Ygbq7KpCHQvfPdb1g== X-Received: by 2002:a17:902:6b4a:b0:149:7c73:bd6f with SMTP id g10-20020a1709026b4a00b001497c73bd6fmr2966661plt.46.1642750777816; Thu, 20 Jan 2022 23:39:37 -0800 (PST) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id t1sm6005968pfj.115.2022.01.20.23.39.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 23:39:37 -0800 (PST) From: Kees Cook To: Mat Martineau Cc: Kees Cook , Matthieu Baerts , "David S. Miller" , Jakub Kicinski , netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH] mptcp: Use struct_group() to avoid cross-field memset() Date: Thu, 20 Jan 2022 23:39:35 -0800 Message-Id: <20220121073935.1154263-1-keescook@chromium.org> X-Mailer: git-send-email 2.30.2 Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1758; h=from:subject; bh=yGrVKJycM9qivlstRAt4EfHl5vdMltBdt/HqxajR6wA=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBh6mM3Kzvim73jJw1jchuqW5i5KKj0xFVS8nRZ1MEy YrQE6iOJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCYepjNwAKCRCJcvTf3G3AJmx1D/ 41qpIDOaMktPi/OXv2JS0l8Y6yahywC7M/IL2yWxJqReTyQ/TGSfDZIx+g5bsg4+CSBxEyqePyxc8I BOCEmGny2GqWbeixcRQpzODGJmidasyWIQJYr/tR4fJq/TzbkrUy8omwXlfDzWxV/f90ONw8I3ZsBv rAeik1f80B4OmkGlxhAIrihDRlxPLYdC9OAW7NKGMD+6TiK94xVMy2Md2soiznKz0zrINsMwykTi2r hjUEhUCo7zdwnew0qdn9EpMTWtRbV0X9jwaylle24dI/0xUuCnau2FYPd9CaArUKAGCwdBLNzwP05c oDcT4M5WF86HnonrnAPFmheRPU3DOKESv+0Tx0MdeAzTQdhMLoVl/rP13wvh9ivzZUxHWteCA0+WPf RrpLoCRwTxSfs6K90OQiO5HgJA0lIh2KE0EPxFxrNUWWkYo15prCPU73zqCNnj2jv+WEksf3X0LSXz upMs54qoPEovaR1/XGZ6ds0SCyPJuyQsmRj61gaHoHVS9/Y35/CfQQFuM1zYV0eStN4+Uy8yZWTpPx Hzr6CJE3nJv1JGfGjAKxLZpakcvUeH9VCxHy1/DoV+J4F4zFL5dcteTqQ2oGvPepXq61bNA5rQYa9w ZwAI/1E3+GIx2JA2dfkvqyJmBQAuQZLRaxX55hOCuJdCGHq8CxdP45lxz5Zg== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In preparation for FORTIFY_SOURCE performing compile-time and run-time field bounds checking for memcpy(), memmove(), and memset(), avoid intentionally writing across neighboring fields. Use struct_group() to capture the fields to be reset, so that memset() can be appropriately bounds-checked by the compiler. Cc: Mat Martineau Cc: Matthieu Baerts Cc: "David S. Miller" Cc: Jakub Kicinski Cc: netdev@vger.kernel.org Cc: mptcp@lists.linux.dev Signed-off-by: Kees Cook Reviewed-by: Mat Martineau --- net/mptcp/protocol.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 0e6b42c76ea0..85317ce38e3f 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -408,7 +408,7 @@ DECLARE_PER_CPU(struct mptcp_delegated_action, mptcp_de= legated_actions); struct mptcp_subflow_context { struct list_head node;/* conn_list of subflows */ =20 - char reset_start[0]; + struct_group(reset, =20 unsigned long avg_pacing_rate; /* protected by msk socket lock */ u64 local_key; @@ -458,7 +458,7 @@ struct mptcp_subflow_context { =20 long delegated_status; =20 - char reset_end[0]; + ); =20 struct list_head delegated_node; /* link into delegated_action, protect= ed by local BH */ =20 @@ -494,7 +494,7 @@ mptcp_subflow_tcp_sock(const struct mptcp_subflow_conte= xt *subflow) static inline void mptcp_subflow_ctx_reset(struct mptcp_subflow_context *subflow) { - memset(subflow->reset_start, 0, subflow->reset_end - subflow->reset_start= ); + memset(&subflow->reset, 0, sizeof(subflow->reset)); subflow->request_mptcp =3D 1; } =20 --=20 2.30.2