From patchwork Fri Sep 22 17:50:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 143652 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5854910vqi; Fri, 22 Sep 2023 13:42:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHqcZdx/p0hJqHZI7GVEjxeB54w2pNAeBzNFEjKg7SWII+cztkupic61c6ZcQtqNTidPN4B X-Received: by 2002:a17:90a:e10c:b0:277:cdc:29cf with SMTP id c12-20020a17090ae10c00b002770cdc29cfmr760436pjz.46.1695415371124; Fri, 22 Sep 2023 13:42:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695415371; cv=none; d=google.com; s=arc-20160816; b=g5IesjH41SgGAx+nFeWn4WgActt+ejWf6XG35GNSS2IQ02HOIdPNYf7dnLXG/08KtU /yqz/q3BTy1txi4QqV/4n+UPVNidltRVyWo5gHsKaL9p76z67wFuj+hojWPreFPyCUTa GdkXkGh7SNgj19X6R2dkDCzXicwW74JGaa0sDQSPqeiNnBgViJ9zBMDW3D3cSb7ErSC+ NzsG6tCi08H2Bg/jzSZP6nP0jXmv8aHm1PAG2FGsdwpDLn4yMewQBY2hhqdbt+LfF8rT 1ooH5ogJjYJegOAaZ8yadvlZ0pBWYJ1GHxCd5w8CM9tHob3E59lSmWwwkmFzW6g0vYyh rVUw== 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=NHp1ED10bg43WmKmQvz+z20YRsbZCcJDatOaeiR4cRc=; fh=IWVnnmn+UARQfSpKnX6tcxAcMsZGXLO5zhKiPF28TOo=; b=ob880nk2KHsoI1+vUNCgQ/pe7DdYfjt123CNI0bsW5dIFIfQdAZafZIzxkrD3kMS2g sUWKkakCNTHB5kNARzG7X4yPGOpgLk2GidWBBHoRaqQhiz+tCsupIx+C9XOxjfT2fZZY 5EQgnhuu6rgVPtaZraSaYP498WAlsEiwDoM97hhxgD4k58CEYOPZPJ1zOepMQycqqRVQ 6HNMusTWoPzX4uIMnlHfhsoHOxGqnbtsufQpBUEDayARXJgb8OLvSygE9A5sl/7qiXzH BvuelPiR2FrYQ+byzGkiZ+odTKyRDXQK121025n0XINSe7J9BtFdhGGYSU8zuE5X7DEu UtrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="kYM/pP2N"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id u23-20020a656717000000b00578fc9e1ba9si4424804pgf.177.2023.09.22.13.42.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 13:42:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="kYM/pP2N"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (Postfix) with ESMTP id 3B4D3836E24A; Fri, 22 Sep 2023 10:50:59 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233500AbjIVRuh (ORCPT + 28 others); Fri, 22 Sep 2023 13:50:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233374AbjIVRuZ (ORCPT ); Fri, 22 Sep 2023 13:50:25 -0400 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3692E48 for ; Fri, 22 Sep 2023 10:50:13 -0700 (PDT) Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-692b43bd804so613322b3a.1 for ; Fri, 22 Sep 2023 10:50:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695405013; x=1696009813; 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=NHp1ED10bg43WmKmQvz+z20YRsbZCcJDatOaeiR4cRc=; b=kYM/pP2NkUCvetwgd+hi6+i1TURFdyU5Oa7s1I43DF2teL/5DdyXDjlW5YDjUpgPGu n1astgEiVM8bluAbe2EQCkyG7BrccQXxyR7kGeKqj5FcRbXolUsgUDLDDSYQgC5TI5zn 3Eyut2HzvPs+ZIjuhvj5pxRchXfhHNw9HATR0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695405013; x=1696009813; 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=NHp1ED10bg43WmKmQvz+z20YRsbZCcJDatOaeiR4cRc=; b=wgu+Fh6GOfp/PI71a/Y1ViJMYdOJQfFEpK4T9SfTEK1L+AnZvqZPPc8jnhr8F7EyZA Ve36DtA4NtwH57175ykHcYEiIn1JHhttn7CzyYFaqGQHrMb8EiMm20TZFRcbmExdBBAI eB0aGOBh4JWL9RSKVRhrMRYMa7SsKULgFY0sE8LhDhaayj6LzKNnqvTW5VrbkjGpyqXj RV5Yoiq5UA7vRWVlCWSWHMyW4nR6ZRpylmPqTot7lC/h9ft3I2BSDsYLVypsvEquBPNC 2JLGkLzeuw7Int4BH6bBmBIQwr4hlRHZ3xXR5nSot0Ax+nu+43qH+R/V4zxhT68Ri5JD ISyQ== X-Gm-Message-State: AOJu0YyIvDbZC/Q7xaQN3IEpedg2pSnGrd2zdcTsiUPwN+xT4iZCzn7v RHB5E8JqZRHpRxyOJW70xHKF8Q== X-Received: by 2002:a05:6a20:430b:b0:153:b16e:8db1 with SMTP id h11-20020a056a20430b00b00153b16e8db1mr245441pzk.10.1695405013229; Fri, 22 Sep 2023 10:50:13 -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 21-20020a170902c11500b001b9d7c8f44dsm3767571pli.182.2023.09.22.10.50.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:50:12 -0700 (PDT) From: Kees Cook To: Alexandre Belloni Cc: Kees Cook , Jeremy Kerr , Joel Stanley , linux-i3c@lists.infradead.org, Nathan Chancellor , Nick Desaulniers , Tom Rix , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Matt Johnston , Krzysztof Kozlowski , Jack Chen , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org Subject: [PATCH] i3c: dw: Annotate struct dw_i3c_xfer with __counted_by Date: Fri, 22 Sep 2023 10:50:11 -0700 Message-Id: <20230922175011.work.800-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1240; i=keescook@chromium.org; h=from:subject:message-id; bh=g1g4deThn2jq2/HmpjUdVckXHtYrg1phRYVjxqpT31c=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlDdPT88H9qzG3LMBy5A38JWSSkUyL3Eg6YJLhU eMX5HXSGtKJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQ3T0wAKCRCJcvTf3G3A JpPwEACXZRomIRPU03APpI2pgvFryCHHAmuDLTXo0N1fOecwRoE4OGPaNSqxHZPbQchIrRD5yF2 2dtE1vedKPQ36FCNd1BwbsjXBmiJ3TNdl6bYV8cBK15uCpVDhwWgGbYXEOb0ZFC3W+Id4Y4vUBT rP7TxnKo2Y/NRYdKNeFRo+0kGxIW3o2B9flG2MIwDroKvUztJPHPJ+w/XDm3fUA7mJlAeQ/Ft1n pfiE4aFzxeUBy75Y1n/Kb1+CIFw8hFjmV4PmfTlUbdsYL2HNl9kX5b/+ULhPiEr2yr/namr9ckn Bv6v30Wc10cBSr/YO4ueLcr/RYKLZqJqmx8w1numFHJkhRIbk9d2D+A5Qxx3i+/LO+A25t45cIr CazDqhoKDhq66/KtUesFjWOpwuIP0maUx/BcoKvTDVziUbNKlM9XVEsUg1RCR25GOTAIPyYqKRK tERqOZjC1PEzFwxPvIlX81QQVkxPEnwgux++N4hNgXMqK3uGDPrmP65kpeVLv55kh0QB6lOOloU 1CihM9VKHEPWBy2KM8zJVbTbyn5PlQQ8D7c7wcTO4ocA5q1cqWTf/R0bH8YIO0lCX6AuhnUcLCT 5MEnctf90+Y4LvEimrbWP8c+2OJp4TPkHzH/bwt5+YoxFvuJoCQMkQxvnE1mGXVGjWiNwc4gBC8 c1GN5F1 dRrNbxxQ== 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,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.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 (morse.vger.email [0.0.0.0]); Fri, 22 Sep 2023 10:50:59 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777771868285174465 X-GMAIL-MSGID: 1777771868285174465 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 dw_i3c_xfer. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Alexandre Belloni Cc: Jeremy Kerr Cc: Joel Stanley Cc: linux-i3c@lists.infradead.org Signed-off-by: Kees Cook Reviewed-by: Jeremy Kerr Reviewed-by: Gustavo A. R. Silva --- drivers/i3c/master/dw-i3c-master.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i3c/master/dw-i3c-master.c b/drivers/i3c/master/dw-i3c-master.c index 9332ae5f6419..ef5751e91cc9 100644 --- a/drivers/i3c/master/dw-i3c-master.c +++ b/drivers/i3c/master/dw-i3c-master.c @@ -233,7 +233,7 @@ struct dw_i3c_xfer { struct completion comp; int ret; unsigned int ncmds; - struct dw_i3c_cmd cmds[]; + struct dw_i3c_cmd cmds[] __counted_by(ncmds); }; struct dw_i3c_i2c_dev_data {