From patchwork Tue Oct 3 23:17:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 148081 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2409105vqb; Tue, 3 Oct 2023 16:17:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHLFGpxnT7rHc9vw8+DVIiNA6+tx2jvGb7vRjtdDsEjC1ASEN66wLgrQbuta4dv+0c3zcd1 X-Received: by 2002:a17:902:b7cb:b0:1c7:31b6:241b with SMTP id v11-20020a170902b7cb00b001c731b6241bmr1005401plz.7.1696375073722; Tue, 03 Oct 2023 16:17:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696375073; cv=none; d=google.com; s=arc-20160816; b=boV6ooOURWBTdFJRi2Rp60TvDXPM1Li8V6uWOo8fzRCH4VMz/51I9dzVHZ9+jklUdD 4s8zm+WjFg5F3fkqelnyBdhG9nnDTFdIiWMa/A8yDzkmUPpFwNgHWFe+2XgKnSfGj/Bg S0/DHQ0zl79Hv5XaLnwTqp1nZsB6s11cj+Ak8ReNM66lLQrwzEL+h0Ila+f1y0lyq6Vb 127Ur4H1vbRcNrivpUkjmecMnDh5vQxzLEPYRTtHPEtaSSQPhYAYvPnZ3yfnCbul33/x 4LuxKHAj1Ty7t2FRWRUIxx/gSinRsvuUxtHBiscBp3q9ZSVOXhAH8QWkopnI3ZAcRFuY kxXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=pC6/v4iVoFQU1IrJy4nniQew2pnCIehdGbhCmJV0Sik=; fh=0NdrRhclV14bQ5zCt/6l5RFtkqWxO21LeCRg4VyY36w=; b=Xy7AtHGBpau2eiE4uZgrAi1IHqDsK5C1HVPaOzNZl4MvRa+8L+RulSIF+UUzWk/s76 f/7eb7shhxPl1fPdJqWKdO+MroWzJGfFu9bwD6rsBP2DettrgZFkHwZFIfxxiooUguDz TjYPCm07YrFvu0fd6RUBG059toOnl1rg0UIL/ilmW7s5QQkUaRAvzjiqDo15D9mwI2/B sS9FDWB7qMUX1W/NeTzFacQltFkehsmeeoTQ0KQ8NroW3Xel2fd1SqERgfSSdp98NlZs KyqWOS3YJY++dVGhAd2tfYSMjnJwsg+jt+6BF7n0985rMGPZK3GaSz7hxV+ObY4NdNoq vBpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="ofs/0CjF"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id b3-20020a170903228300b001c62cfff798si2769016plh.372.2023.10.03.16.17.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 16:17:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="ofs/0CjF"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id BFCD781A9ECE; Tue, 3 Oct 2023 16:17:51 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232491AbjJCXRf (ORCPT + 17 others); Tue, 3 Oct 2023 19:17:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232338AbjJCXRd (ORCPT ); Tue, 3 Oct 2023 19:17:33 -0400 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 101ABB4 for ; Tue, 3 Oct 2023 16:17:30 -0700 (PDT) Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-694ed847889so1245315b3a.2 for ; Tue, 03 Oct 2023 16:17:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696375049; x=1696979849; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=pC6/v4iVoFQU1IrJy4nniQew2pnCIehdGbhCmJV0Sik=; b=ofs/0CjFBF8yBfnP9ab3lL0Df1RvL3orhXCX1ITuM0rJ7eEimE4hWAEDheSfQsoay1 iwf1xGJngWp5ci9C36sTwJqZzvwFNKH09X6gFWlqJFzOTjB+Br2IgFpMZVt5gE1St82h vTuTqL+IkDLL734sl5hBU+eDEcQjpxb8aky0Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696375049; x=1696979849; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pC6/v4iVoFQU1IrJy4nniQew2pnCIehdGbhCmJV0Sik=; b=gBFmZ+BtcZ0Nd8qahdFqZGXmaY2zaEUtenBGZKu/0Un6H0ofU1leCUWXOlhZtELkJ6 wsy6aG5n1/OCMn+POArMEWq2fbg6nvVj5LNb7IGbcqfMg+ThN1ilWY5U189pkeEarwZV 6TDdwHg0ifzLURGg+V2cjKjYx6UlxeijXdgEVAVnujF4K4YxZW+9kPkU5JBOvtsLijSI rE+qpSJEtNrfZ9Xb3R4IaI5UxQhXFZb53rdg8d3DvyisHP4Vb5AmxSuGOPXU18I9bXzL QrIhaBD2V2OgZZKsajFvo04rNl63DI6p+OS0pvwEGkbEvtyyKxD4P0GSddKct0UE2B6U 5zpg== X-Gm-Message-State: AOJu0Ywn8K8ClNp7BilOZZDCBN0kUgzo/bEmXQNJNtqrcxuuh1asuDFo 6QoI1ncs2I6zYMwrTBSk4MZJkQ== X-Received: by 2002:a05:6a00:179a:b0:68e:4587:3da8 with SMTP id s26-20020a056a00179a00b0068e45873da8mr1129484pfg.21.1696375049514; Tue, 03 Oct 2023 16:17:29 -0700 (PDT) Received: from www.outflux.net (198-0-35-241-static.hfc.comcastbusiness.net. [198.0.35.241]) by smtp.gmail.com with ESMTPSA id n7-20020aa78a47000000b00692c5b1a731sm1906278pfa.186.2023.10.03.16.17.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 16:17:28 -0700 (PDT) From: Kees Cook To: Saeed Mahameed Cc: Kees Cook , Leon Romanovsky , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-rdma@vger.kernel.org, "Gustavo A. R. Silva" , Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, llvm@lists.linux.dev Subject: [PATCH] net/mlx5: Annotate struct mlx5_fc_bulk with __counted_by Date: Tue, 3 Oct 2023 16:17:22 -0700 Message-Id: <20231003231718.work.679-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1504; i=keescook@chromium.org; h=from:subject:message-id; bh=+jSITB/6TjSNj+40UA2fLQfGBMphst2NI+EvobKBg1k=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlHKECE89aWTMpk+BTOLsSMGlsQ5PDBZzFpKrD6 7pVALRUNgqJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZRyhAgAKCRCJcvTf3G3A JsAED/9rep0qQL+Uri2yFkaImn8wrEfqCeiUW1dFWN1RYWA57gJIdN2l8m9to7t7t5Qhk8gp0Wl TUT/iVzK8etbeuqspeyDrRAJ5ePGg2PGNCBS5ghrevJdY2fImYvh3ARSOdc4e/aFOzqLbqXaKAK fwLmjvTj0gcPTX63rT3vW0m3BUBNODkOb0uRZ7Y4D+Jha0Vu1Kmp8zNxpazut9zE9tf31p++P46 Tl15RjuVZlraJnO25sQCiO2D5kFio2XrIcavvPvIvAVNMCPb8d/+n0v7veeoWKmUhHv2T4+dtBj CM/BxQs7ga8vX7Srtu8dFy8KqMYSUvEsWppbZBv7UIvb/+zbdKjVWDcRXwaj0nBoa3aD5vjwoef WBv+62w7L34Pq0OBEm87kf5hbU9sawslHfkzscuh1YhbLIwANFe13YToHZy4tXL8/hq15yS9V3g O8M8WLXHQISnuGDNigW84R1phmsUt5Xuqq8Gu4Nd6kk0mv2mBUu0bQEVHvKH5glOHkipYjsl+x4 wbn8hGzVBszGzD8zrQZ5r3UBiPBuM4tSqO5Wb7LQPWIyB3/KvMwK2DGdCY7dQOiD0z+wbHxHrP4 FFDWH3HyBf9odaSZGGyOFqdaCpNJKZ6RyVW8BSBJrHHwqWjANX+jFn7TODlZ6UKXpA9uWpZEWSf SNOYZmX OgJF6EZg== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Tue, 03 Oct 2023 16:17:51 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778778188923700534 X-GMAIL-MSGID: 1778778188923700534 Prepare for the coming implementation by GCC and Clang of the __counted_by attribute. Flexible array members annotated with __counted_by can have their accesses bounds-checked at run-time via CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family functions). As found with Coccinelle[1], add __counted_by for struct mlx5_fc_bulk. Cc: Saeed Mahameed Cc: Leon Romanovsky Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: netdev@vger.kernel.org Cc: linux-rdma@vger.kernel.org Link: https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci [1] Signed-off-by: Kees Cook Reviewed-by: Justin Stitt Reviewed-by: Gustavo A. R. Silva Reviewed-by: Leon Romanovsky --- drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c index 17fe30a4c06c..0c26d707eed2 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c @@ -539,7 +539,7 @@ struct mlx5_fc_bulk { u32 base_id; int bulk_len; unsigned long *bitmask; - struct mlx5_fc fcs[]; + struct mlx5_fc fcs[] __counted_by(bulk_len); }; static void mlx5_fc_init(struct mlx5_fc *counter, struct mlx5_fc_bulk *bulk,