From patchwork Fri Sep 29 18:11:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 146866 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp191196vqb; Fri, 29 Sep 2023 21:31:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFl3wzE/PGoA1jKUhDelEFBbjA3i5F3fpnky0eBcqhaWcRubF+QPegxajzbO7+Frehp4dOp X-Received: by 2002:a05:622a:10b:b0:419:59c8:e2d0 with SMTP id u11-20020a05622a010b00b0041959c8e2d0mr7027946qtw.26.1696048275159; Fri, 29 Sep 2023 21:31:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696048275; cv=none; d=google.com; s=arc-20160816; b=kFPnnXgyXFACfmyZLjmhTySDFtdaYfBsCkZ2t7Elv4AHnpwA7Ke16yYpIDQYyR2N/D h4jncWy7QNgXh4gQDA0wpuT8Yl5p8v7INrPKqXjTCdOv0SglLAoo484jcEg1guolbmgo rKrbAkcBAxnfkgS3ZEmYbEBko4qaSRzmiQ1Wm7DHMno3gDFJL6gNk8HpgHyAzpDi5LSA 2Yr9/K1quKUrw6to7S8IxP65hVhd7Of7GVe59zUeDRZORJxq/v4FTx/RItXMOwyPMLw2 ZpMi/BedA9MMvG17MKm3Zbm6dYJAlqUqY5kdenMuK4I45z20ZSv+gln15ubVJRxLF330 aDcQ== 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=vrmkuelEd3rJ28up92cyB2Np2I/dyvESECk2QEaqxqI=; fh=BeJf1PwnnELZu04DpOI2vxnyEd7+8P0s3qiAeicJR0E=; b=hbd9E5AMzCeYqklusPprgFSai66LfOInuwuSRodyNn3G3U2WBIBxkfeEkwIjjEi9sk xzRuOROTLPkTLaVoKceWS3SNqBXYtZiVqjwc5vuM6KHzCXjC/88J1ILg7/blDIbpufe+ vMjbkeFg8ujuWdSeWo3Fnc16uU3Cb2WV2aYshMZKuKLN/zcXsL1NpVuEa5yMsj4GOty4 mVmmx3PRhZ6DSBROZN1zHnNNI6Rzm9oQSZa+Wasw38ZEaWlbu+v7RptVrl3KS3vS++P9 qHscEXXWm+aD+o0V/yF+qknonKVff/0Vc5r9+e7jW8S4B2wOPPCNggvfip1mFxLzqcEg 9sxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=flTXVNpO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id i21-20020a056a00225500b00690d42e334fsi21818986pfu.181.2023.09.29.21.31.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 21:31:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=flTXVNpO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (Postfix) with ESMTP id 3708080845BA; Fri, 29 Sep 2023 11:12:15 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233821AbjI2SMH (ORCPT + 19 others); Fri, 29 Sep 2023 14:12:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46974 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233635AbjI2SL4 (ORCPT ); Fri, 29 Sep 2023 14:11:56 -0400 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB0651B3 for ; Fri, 29 Sep 2023 11:11:53 -0700 (PDT) Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1c6219307b2so72504315ad.1 for ; Fri, 29 Sep 2023 11:11:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696011113; x=1696615913; 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=vrmkuelEd3rJ28up92cyB2Np2I/dyvESECk2QEaqxqI=; b=flTXVNpO4qOVZlBAJzuGgI/EHIohwpzeMy/6PZ4cuSEtEmEfrjO4f4/PxeSuhSCiHa 3KvLw0spqKmkQN4/Y08W1bR0V5YOWy4tm9t5IExSAqoN4qe0H89Clk55yFSaNHAORypn hyXYnXAQbzSRbHtcuXGjARxMPEEEfuiVlkA74= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696011113; x=1696615913; 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=vrmkuelEd3rJ28up92cyB2Np2I/dyvESECk2QEaqxqI=; b=Um761PhGKe18oNlrT2bCCuPagKSupqB/IrXBKvdik1+oHEobe6srkqgScomv5WpDHd JIZVCMfUej27DahVDviHVulMUK4IYvXhuc5Spegdwk6VwG57PsbVhDv+F6mmul9D2GYJ SF83wp+ZJX543xfvBjOvPWLCTJ0/869umroxeJIXFebcGQR+2qzoRPkbFXLUeCKF81YW bxK+RBs2UcNdyeX2KR00xZF5aw7ZkQkH9B0bQHPkxoG6oe1T956xGW+RDtHtueREaaNB U3aprLiI3lBqHmUcrrsshTNpT5Pexzi7f6tbn7GqihdINbqWJqaVuZm9o6Rv5v1YyewB tDaw== X-Gm-Message-State: AOJu0YwbHCobrwLef0U0X3odagCVktG/6Qc9qAC3mvoBIlvQCZw+eW2o kzYIQZ4Er0R6tQsw5R1AVsJ6kg== X-Received: by 2002:a17:903:248:b0:1b8:8b72:fa28 with SMTP id j8-20020a170903024800b001b88b72fa28mr5257379plh.58.1696011113144; Fri, 29 Sep 2023 11:11:53 -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 u16-20020a170902e81000b001b898595be7sm17123630plg.291.2023.09.29.11.11.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 11:11:50 -0700 (PDT) From: Kees Cook To: Raju Rangoju Cc: Kees Cook , "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 3/5] cxgb4: Annotate struct cxgb4_tc_u32_table with __counted_by Date: Fri, 29 Sep 2023 11:11:47 -0700 Message-Id: <20230929181149.3006432-3-keescook@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230929181042.work.990-kees@kernel.org> References: <20230929181042.work.990-kees@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1483; i=keescook@chromium.org; h=from:subject; bh=WNbLnqzZE+z+esp5efLnkGvq7OtgHHNunnfXU8ZF7oU=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlFxNk0t1kkwpfJqHrZx/YdrjBahRhU6dQg7Okx u6FscRO6QeJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZRcTZAAKCRCJcvTf3G3A JidkD/9HX3Au2/63QgH0EK6PoLXEVxhxTyzFmm55RQkNUQ12mIdkyPQhXOdXdPaHOzINQkl3IxD XtInCBrvYRQV2fX6pGVD1FzuCQ8SVPLSnzKPJ9MzkyBA8G85jQJa27qbc8nOjADf84SnqUCU3E7 abcFVVjUIDSZ0Ra/x92q32EPlOOmtGen8/5bd8oxADgtB1544tA/KdDiSkdx3YCXjN8VB3z7xqX Wd/RfUFBxFKzvD04iU34CID25Fp2EVQpI9y40lIzMtT3PizWOSLDYoFQ3NMr9dd9j71i3jHRkhU GaapzNg4UDQBfvv+ux2J5b6i+IAKJu0b+8a7tIfhhaKBNp2ISI4vIk9HqloOnQd+BWuluLKBpWj hrNtFoV3awi1v4YzPnCKrK0MvAhSaBekPoVttFqzxYutyFR66bgQx8yWh+h1V8+PfuZXkEhqpbO 716CDFdVDm5pX8SWdmfs34fHxXg7aaD0cbUiOzEgXBZdyIZfRo+jtvT7z3lSEKFowA6ob5zSrCQ WRJT6MRTbvYTC5OtncSF65Ban2SQYBF3y7H8RvBQP4DCLG/hISKlxmIE/gCdL5musZW/gOJEyXx pxcm/D9H08sb0IH4WQreDSfrwlrjgngkjeCI+ouNbR/ybBapAwLHlhNU8QpNMPwM/LW4Tu3f2aX RMyKWiztAyV60qQ== 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_NONE, 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 (howler.vger.email [0.0.0.0]); Fri, 29 Sep 2023 11:12:15 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778435516348006111 X-GMAIL-MSGID: 1778435516348006111 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 cxgb4_tc_u32_table. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Raju Rangoju 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: Gustavo A. R. Silva --- drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32_parse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32_parse.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32_parse.h index f59dd4b2ae6f..9050568a034c 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32_parse.h +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32_parse.h @@ -331,6 +331,6 @@ struct cxgb4_link { struct cxgb4_tc_u32_table { unsigned int size; /* number of entries in table */ - struct cxgb4_link table[]; /* Jump table */ + struct cxgb4_link table[] __counted_by(size); /* Jump table */ }; #endif /* __CXGB4_TC_U32_PARSE_H */