From patchwork Fri Sep 22 17:50:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 143673 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5878614vqi; Fri, 22 Sep 2023 14:35:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGiEmh0/a1LxSbfTQGzbCAcGpd5J8tiNlGW84yqQgCho56B7PX5yCpB1he+p/7UCMnlcJF9 X-Received: by 2002:a17:902:ab8a:b0:1c0:98fe:3677 with SMTP id f10-20020a170902ab8a00b001c098fe3677mr585851plr.56.1695418520166; Fri, 22 Sep 2023 14:35:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695418520; cv=none; d=google.com; s=arc-20160816; b=msY+Zok0+FjpeJIhZWHU5IRA7nUTuPAOKWQWSyEThguXwGm++od8tRaqKHvMMa2tKP Z5MwBYTEqy24O7g1bxa8RK/ROiQFcUs1wtvYjVPKA+wndAF82A7wzP6Ha5cfDxQLZhH7 JPa1WKc4+aI46xX6xknOQ1jXPOhdTDgO1oLPgCpcmKxUj9CC57x+W8YCzkqYCcsu6H8q k+VQC2U2ddPv06xVkIxZEs/974iqrjo68rrKq7ZbfLBlld056JdHqdcwYUhSpneZrxNk bC9hrj+eY76D97M9uk447382Kj/4K38Ht5MkhsSAg0uY9LzZv+gvRhyjvqGihJf7F63J 8AIA== 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=n9keGpI24f73ClY+CDWArkkyfvsmbI4ZAwNSISbMEuk=; fh=3gAyJ7z3ZZZ4PRF3/oxj3lwFYKgX0apRSqaYb+SEFu0=; b=c3CpaR6Wo02zy7oQAIIY11+HVFei4EWeMdE0ouqDqeOY6gk2hkFaDOzduLUW5nHuNy Q0NKtgkXaBwurOZjhfY2PzzPUUY1GQVYdLwLAqh66HZbos31bofYKq1h7JFaiW4qHPux eyboDc0WC1PAQiZSuW+NQ166eLzfkZnf/deGVRaO2CtLi3DDuIjBIAe4TG6X8FBw3DGj qIUFjyH+Ss4Ser/I3IV7tJc3RUJ2hBmydX7xYdUZrLMYXDl2eCNcvYHyCBz+S3mP/1YL YSPg+0MxvVvhdGzqmevmIvb7tc7OAoeFKTjuXudAFlLQUzLjdaFCQoZ1isrztbbavnZN 6gjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=HCScKNGQ; 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 p20-20020a170902e35400b001c45c05c3d9si4211694plc.182.2023.09.22.14.35.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 14:35:20 -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=HCScKNGQ; 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 59CA18270064; Fri, 22 Sep 2023 10:50:45 -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 S233591AbjIVRum (ORCPT + 28 others); Fri, 22 Sep 2023 13:50:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233469AbjIVRua (ORCPT ); Fri, 22 Sep 2023 13:50:30 -0400 Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2AABECCB for ; Fri, 22 Sep 2023 10:50:18 -0700 (PDT) Received: by mail-pg1-x535.google.com with SMTP id 41be03b00d2f7-578b4981526so1812472a12.0 for ; Fri, 22 Sep 2023 10:50:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695405017; x=1696009817; 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=n9keGpI24f73ClY+CDWArkkyfvsmbI4ZAwNSISbMEuk=; b=HCScKNGQ9djV4FJJFL+r/OeIwkUmaW1MHBaCQYB1F6FJlRz0zHwxJJMx71X7QgIYDN Aaa0RM1R2lxKqzNqQ0sAHgbyj29/QLqVkiArMhaLIRusL4PfOXkuSWnYsTOgPIyNPCxo I81eurxFBlveuYEzV2Z/s5uaKQPeNiDkuFOjo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695405017; x=1696009817; 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=n9keGpI24f73ClY+CDWArkkyfvsmbI4ZAwNSISbMEuk=; b=MKECC4D/BMASaM5yhVfL2MiF+fRdym8ji3gRmdpS6q/LLXFJ1N1qsEhAHIOStIsITd SFitJl5PuRx6PiXFHgJqEWVf2sC8K0KBohsbulAr/bWy059NihTS89ljEsAy9ymhViCN V7O4Gi2a6i4ROTWKYNutcBNS03asl4IdnOzkEb8RXVedv01tu0QA8OkadvetEJxRK0su cFyukZyITGAS8RJBoWhAtYq8w8z5NPlZcVv3UK7FM0EBA815/SEqHpClzNdoNKo0DDcn ZWjr8l0eoTzOMR9XGarKyTAA2cvCe+4vJMC3dUEk97UJZtYPOq6nQKAwls6j4i9haXgb eTIg== X-Gm-Message-State: AOJu0YycFZRN42nhSVG9u5A455QE2f8aq8ud6liHOTn2P9ROL3hSz3/z b+uA7OxcrEpSbl7aRBGi/39ljA== X-Received: by 2002:a05:6a21:1a5:b0:130:7803:57bd with SMTP id le37-20020a056a2101a500b00130780357bdmr225662pzb.3.1695405016897; Fri, 22 Sep 2023 10:50:16 -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 q26-20020a62ae1a000000b0068ffd4eb66dsm3465165pff.35.2023.09.22.10.50.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:50:16 -0700 (PDT) From: Kees Cook To: =?utf-8?q?Przemys=C5=82aw_Gaj?= Cc: Kees Cook , Alexandre Belloni , linux-i3c@lists.infradead.org, Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org Subject: [PATCH] i3c: master: cdns: Annotate struct cdns_i3c_xfer with __counted_by Date: Fri, 22 Sep 2023 10:50:15 -0700 Message-Id: <20230922175014.work.637-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1216; i=keescook@chromium.org; h=from:subject:message-id; bh=nFAdeiJyBBAN2nKXtTbKJp+l0ifJ3TjsMbq5N6rgU9w=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlDdPXeEDRSo/vrvPQpWyJYQlr8t8eeYkEi3JUW aibP2KoNw+JAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQ3T1wAKCRCJcvTf3G3A JhqAEACFSx47UGcJAEXS4JS+FsFG8ENlzAj09y+6MUbVP+WFjPpnkap95ejxcB4GSfsDCqDxk6l LI+ahUhhLo96bzoYSLBN9IV/bTNp+UCcPA60RZwi1hEFT516danvY6/UgAYBXnWHjRT2mwY3odX yy3kqrqLDUnE3ETLmj7fMNLBhq3ZuSq/m/XUToa9/h+24FUfhzbUTBikmHvfAcveyS+RuxjO9qY ed0C41STALin8Mqjuy9khWvT8vR42ScDvLuGiyXsymCn/mx4I2J4ddu5LH/2IS8VU2YmaMNctjg ptvies9UobnLJBW8R/IZHZ04Beol8N6tigZtVT5CCdCkn8LX2w7ZwYR6ajB/A3/IaNSW5exMyyw /fok8hnoJA/gcVCwUm16AX3pOIbVUEDyHaFauMP6vJZ0zHV5pJOJCTylmIizWc9HTOYV0NHkpwb 8JEjbN6xmyxxkPy2SpwEdxWpngNkl4BRwZeyOV2LFic3mtPOPfrJkhQU/qUmsdaqacHAXERuTHh 2KPB99gvcM+fdO5CeCkrYIa+gNwDc0xfAcKIM3tL0FOVaulCGqw1bIFmIV8j6FJCbGoY+GObpnT xUWz5txRoRBsr0UsApv4Bsd5OFnimSTXLoSBWdriF4p1gKcvsPpxrqYI49ejrS4hjpmZDrCM3CX mLCiun2 ZcNO3KyQ== 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,URIBL_BLOCKED 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, 22 Sep 2023 10:50:45 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777775170602028779 X-GMAIL-MSGID: 1777775170602028779 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 cdns_i3c_xfer. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: "Przemysław Gaj" Cc: Alexandre Belloni Cc: linux-i3c@lists.infradead.org Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva --- drivers/i3c/master/i3c-master-cdns.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i3c/master/i3c-master-cdns.c b/drivers/i3c/master/i3c-master-cdns.c index 49551db71bc9..97c1010956a0 100644 --- a/drivers/i3c/master/i3c-master-cdns.c +++ b/drivers/i3c/master/i3c-master-cdns.c @@ -387,7 +387,7 @@ struct cdns_i3c_xfer { struct completion comp; int ret; unsigned int ncmds; - struct cdns_i3c_cmd cmds[]; + struct cdns_i3c_cmd cmds[] __counted_by(ncmds); }; struct cdns_i3c_data {