From patchwork Fri Sep 29 18:07:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 146756 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp19873vqb; Fri, 29 Sep 2023 13:16:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHo4GDk1UrK2nR4hGZJNyMQzpOg6iUELIhcwChxaGaE7ZdhXl2ahCJOz35BMHXWB3hDWCOR X-Received: by 2002:a05:6a21:47ca:b0:15d:ad11:748 with SMTP id as10-20020a056a2147ca00b0015dad110748mr4521893pzc.30.1696018591229; Fri, 29 Sep 2023 13:16:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696018591; cv=none; d=google.com; s=arc-20160816; b=u84QkmjaeW2Tfnwo2+94NBbzjyo24u5j0Nc+Bq6LJk9ZqrAvygHf8Suxx04vFsRdPQ 9je9V7gbaXkmbMOd7l/hXhR0ecwmrj1I5DhAvh0H9LGbnSOGzB34uQ8nHS1Zn2gv0BZW cQ9xDxKkIcPotBITaL8YpxmEUZGlaPTy1JloSN0c/KwdVNfWxDQLjKau5a6eIwczvik2 SCRkGl78/1Qn7BfqNe2iikVjtMEJIwK/CZ0Bi7DUpXuqZeocXhy2ZZChY3c8sXHVh2CG IkPdwK9iOZElHs78tJeqRddSvOTUueIhbosamSiBy2e+5lMfo7vXszdDWFwX3YHYI0gU xNrg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=oOLSGowyT8bp59dkGdiGtSiQE93Lo/hrKnsFucy41H4=; fh=NdFsn03G0BQ0yIy7PVh6T+GPRerauJ+2EiKxLNReKMQ=; b=YyDthj9LKv9o3NNlOdCCdgJK3NIQ5MoIIV8q/uQcIP9FLzdr2F3gOOMa7jBw2VsncN rkpONSR7FPo0nnCl1iUwGHpSR84O9ip2oYira1VSeTBiS8orMJujeUcwo9NVzXNipfoj wkwznw3O2bJXycZxfPZemTGJFYT9/NmkMXfcIwyKbfUeY73uk5uJ1n8Aawtz95TNLXXM PyvgGrVcMiQP/Sbm2MOi4zHvrggRal+SoFLcQoJGgUXAHi1d8X/yd40ljiVW612MCNSt NN+gST73/MZMpCC4GNz6EH7dEoSAp/InYV4gPjLcU7c+HEj5B5V/sZ38wJspUEFfraG5 gTHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=gh7W3iVJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id ct7-20020a056a000f8700b0068fe2453ab6si21029834pfb.353.2023.09.29.13.16.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 13:16:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=gh7W3iVJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id F2A8B8212A96; Fri, 29 Sep 2023 11:08:02 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233764AbjI2SHz (ORCPT + 19 others); Fri, 29 Sep 2023 14:07:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233552AbjI2SHw (ORCPT ); Fri, 29 Sep 2023 14:07:52 -0400 Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3DD4CC1 for ; Fri, 29 Sep 2023 11:07:49 -0700 (PDT) Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-584a761b301so5942887a12.3 for ; Fri, 29 Sep 2023 11:07:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696010869; x=1696615669; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oOLSGowyT8bp59dkGdiGtSiQE93Lo/hrKnsFucy41H4=; b=gh7W3iVJn11bb5eYM1M1fVlqbLwtiZIuAAOJVZnISy2HvMEB+zfMopBuJ4PGkgtHIM l9SCYIZN7MmTnN7vezdltKvpWefWPFnTBaCaUH+/t0TJl1YZyJgcLJXKulS16fdeUsLn bsTDJK3OOCdDgmutff8UgfcJXBtyLKHnCE1ng= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696010869; x=1696615669; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oOLSGowyT8bp59dkGdiGtSiQE93Lo/hrKnsFucy41H4=; b=H4cWKAnPlpm4J3ZnYy/SE6G6W1f/p5h6/50oRvy9YoyvldZLsAzNcmaaRtyKOvdGpJ 2lORCeyGg5+a/RV+2G7V+iU9t2A82yO9Wr0HSXmOgtKtkVck6hJMEASX6sb5dIm9eose GYp3U29l49ofZqGxx4M6SS+2y3Hqno56FH8ZWWfo7XeArmr8p0p/kKmL80Je34lHcB1+ zVlNAURzlZ21FZHjVJEesM/r1OC2mq1rES8ALo4NiuLmpuZ4H0tnQxYMiwAzBUemAOML EtnsfsM25zRhqRDvHPCt4Ce5vBcYhqP6rVy0bIG4G3TjT89aftLkIxs60Z5SnfdxlwVX sxiw== X-Gm-Message-State: AOJu0YwYXRPsrkAJly6/0l8mhaDtHEYCOxZsGCTXy73VpsXN6MM2Hc3m WYLGSpyBNLbK1SYTJYXg+ZTzRQ== X-Received: by 2002:a05:6a21:3b46:b0:157:be16:b6bc with SMTP id zy6-20020a056a213b4600b00157be16b6bcmr4419165pzb.59.1696010869260; Fri, 29 Sep 2023 11:07:49 -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 y24-20020a1709027c9800b001c3267ae31bsm17133941pll.301.2023.09.29.11.07.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 11:07:47 -0700 (PDT) From: Kees Cook To: Ido Schimmel Cc: Kees Cook , Petr Machata , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@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 2/5] mlxsw: core: Annotate struct mlxsw_env with __counted_by Date: Fri, 29 Sep 2023 11:07:41 -0700 Message-Id: <20230929180746.3005922-2-keescook@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230929180611.work.870-kees@kernel.org> References: <20230929180611.work.870-kees@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1591; i=keescook@chromium.org; h=from:subject; bh=L0oxTPzJo9bLm3xCYvLC1IanmGV5YjHUG5FuRGU5Jf8=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlFxJvMgcoNzYyB72yjkUxJlGtHiv6i26l9q3H6 AWqAtX6Z4qJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZRcSbwAKCRCJcvTf3G3A Ju3SD/0aUZX3WDL92XZp5/H8KPI87sDe7TXiou5k61Plb0QhqKrJm0EQvvtFmGQ8yngu0YzXBDM /QQNMEOQ2cHyyMTjGimcMw0tFZWAV7NLgHg6msaDMIsrspl5Oev6Z6e8CZODAqAveaOEP6an6Xv uPlhAv12ovRr/ARjStdeLWa06Q6buKRjbyekciSkT6E69f3tej6z3CcxbXt5n6KUbj6wzfMy+Ie Y6CPL/otBsl0Am4dZG02Cq4efJtZ9y+2rUAI7S/9YTRr8zHPEJEIwB6O1vTsn0wr1y5p1GuMvXg cz51ljKx7ftiT/KptN/6KB6m3vInGRUKZSDZsTtBUIkST+MhSL5HbM0OKHNe/fA0+3nrJBDIToR awf71Nh8sT8X5NhbYQJmRHRiWgn0cvoyIZ6FoDo6G2u5FYgetEpYI4gJbSFfwzhBl9BYzeSlRYg KCpcGhfNGVLxZHppj8PpwtslwJhLb+vPrZrLiqhWSZW209VA+l+fQUBdeGEoANXy4UStmAGhUcN oQ2LCzJ8YbW1ORVDuMlnzsaXZoMRhyIrUCbcZBZP5ON/h6tSYSyLH9Z8vphrEIr+7/XuDhHeUP8 qtvJvfjDXAEVGyjL6s84rvuAHdNLq9TNbMlrrXlb8cq7gOTdf1mtQq7zyud0Da7vFI+AyVBvYeH PkjUGZ7qVyTgCoQ== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,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 lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Fri, 29 Sep 2023 11:08:03 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778404390282264975 X-GMAIL-MSGID: 1778404390282264975 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 checking 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 mlxsw_env. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Ido Schimmel Cc: Petr Machata Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: netdev@vger.kernel.org Signed-off-by: Kees Cook Reviewed-by: Ido Schimmel --- drivers/net/ethernet/mellanox/mlxsw/core_env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_env.c b/drivers/net/ethernet/mellanox/mlxsw/core_env.c index d637c0348fa1..a129e0df1d07 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core_env.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core_env.c @@ -34,7 +34,7 @@ struct mlxsw_env { u8 num_of_slots; /* Including the main board. */ u8 max_eeprom_len; /* Maximum module EEPROM transaction length. */ struct mutex line_cards_lock; /* Protects line cards. */ - struct mlxsw_env_line_card *line_cards[]; + struct mlxsw_env_line_card *line_cards[] __counted_by(num_of_slots); }; static bool __mlxsw_env_linecard_is_active(struct mlxsw_env *mlxsw_env,