From patchwork Fri Sep 22 17:50:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 143822 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp9360vqu; Fri, 22 Sep 2023 23:13:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFbdN2hPDfLAKMhbh0H7/ut6B4rofAQAqYFYuRWNJjnqe1AeIcks3Tc58e5YDQB0KH/alIB X-Received: by 2002:a05:6a20:7d8c:b0:15d:c1a8:c329 with SMTP id v12-20020a056a207d8c00b0015dc1a8c329mr2088337pzj.48.1695449592352; Fri, 22 Sep 2023 23:13:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695449592; cv=none; d=google.com; s=arc-20160816; b=zSkmRcmQ7ioS4uw0cxvsJI6L2qylYaNcD2k+23ytjRDD2dcAcCdEdYgmdXQSYkD/VJ qp57F5GT6g0Tp8aG6EZxpDPn8SuGWNS+ydVYDgiI+buLQyRmIx6XEN07EwI/55JZPNa4 FLm3egz2K40BdsvOcptY28xIMjoxzKBkf5HL2azhdws875clMIE000Nvhyom01doNB/Y wzhFwovW/MfEtrFO5qbuHMtn9J4/NcN+X6G0T0NUzOYEVGaKsTMRQLbMcdTC0FBgxhvq DzXM7u/WKs1+iR2vVKPyGU6M7InOYzW53PTG6/08oK7FO6GmOL0IXYMNDu0m1zm7hs34 QKjQ== 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=rsoVVkVJpImufXYUFiKKi6XhwT7HcFfXx352YN3aPUI=; fh=KxpCaxx99Nxcdip481g7Lwdwn+jNixltRjNIiwUI6K0=; b=Cu+KbalRc1iTZq9ahD5Hv/pKEbsEsWMfcYyaf/Yy2/HTdf11Zaye+VBu5vp9mXWIxt FyrARZdBixUkZ1KE62L8IOdbFDLvHWcw0PySVq2kSHYkb+f4wFcdSQYrvsQxGa4EEkZk 3nmNtbpT7/KnyLPrd5JwVITQVDVuwDJU9cukuCiAnkBKLIpbPHxfENf3aV4JM9SzAprp XK2K4SdGqQUzmZ6zxaJdK4ZgPIynIK8jO7H70R9SL1sdCaDFjCF0gBR4OymzDAU8NiAl zXgeugR3W/stMSp06mCYyePc3SDoNVII0Y2Jjy7iwf/Wq+idui6V4EjIE8LIL1IQRkUd GDLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=jbK5tBDu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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. [23.128.96.37]) by mx.google.com with ESMTPS id g4-20020a056a001a0400b00690fb3c5cecsi5708359pfv.16.2023.09.22.23.13.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 23:13:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=jbK5tBDu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 13CBE8270073; Fri, 22 Sep 2023 10:50:55 -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 S233634AbjIVRus (ORCPT + 28 others); Fri, 22 Sep 2023 13:50:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233383AbjIVRuf (ORCPT ); Fri, 22 Sep 2023 13:50:35 -0400 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5AC11A8 for ; Fri, 22 Sep 2023 10:50:25 -0700 (PDT) Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-68fe2470d81so2269615b3a.1 for ; Fri, 22 Sep 2023 10:50:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695405025; x=1696009825; 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=rsoVVkVJpImufXYUFiKKi6XhwT7HcFfXx352YN3aPUI=; b=jbK5tBDuY+AyLRyxWISuVpznEvxn68FC1zjO3sM+tX4djek4tSpj5DUdgZz1ppptSQ oKXVXbWwQ0c/cgXB50thptSaRFyFmWV2zqOVPUW6NwIF4hlpm281tDCnU75mKCjXSApf Bz7J5wQGcANAJc2hZHtmGH1nE02lmFmlwB3K0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695405025; x=1696009825; 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=rsoVVkVJpImufXYUFiKKi6XhwT7HcFfXx352YN3aPUI=; b=qcTdhxYix5nLiiUiudlSJ6YZ6/+To7n22KerIwFv7MNRNvDsWt1AwgdHxFdpL5M894 7ji3G9S9E/v6hYMGOeENOmfF8aNyw1QUzkU3pEepeqWpkseovL4MfNc3QB8dq0hEoMFk t8renfpuISRpDly06ZqER27KtNfzng2eGiIrz9MqpQaHeNk/Jw4VvHtnEjsDCsTYIY/4 KJrVZblq2wC1jmf0XbJH0RXs7SYzDDwmn5HPnSDBLK3xYrDHdtzI3lbKoRhn8a7HTk8j GJqDi5ccn1zdLz8Ql3S2YyQL86JARjZKksi4jyO2lRPHNvyEfBrsQtC9FI8EopoTRdaV KbAA== X-Gm-Message-State: AOJu0YzMDDg6GS4yUJnu1vWDXMAlK2HbC3YIv2r72o4Tp5hCDAw1+6w+ ULBURU/nOth4ZDXfqq5mgNV5rg== X-Received: by 2002:a05:6a20:9757:b0:12c:2dc7:74bc with SMTP id hs23-20020a056a20975700b0012c2dc774bcmr264040pzc.46.1695405025327; Fri, 22 Sep 2023 10:50:25 -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 r2-20020a62e402000000b0068fe9f23bf4sm3473166pfh.103.2023.09.22.10.50.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:50:25 -0700 (PDT) From: Kees Cook To: Miquel Raynal Cc: Kees Cook , Conor Culhane , 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: svc: Annotate struct svc_i3c_xfer with __counted_by Date: Fri, 22 Sep 2023 10:50:23 -0700 Message-Id: <20230922175023.work.239-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1258; i=keescook@chromium.org; h=from:subject:message-id; bh=6p5WfsNbelw4xW/uYRQkWYI4wKP98hRY7x9zeyJ/VKs=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlDdPfhpFW9ozCUbQKD/ABqFbClMmYYe+xKFK04 xJmgYEcGvyJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQ3T3wAKCRCJcvTf3G3A Jo5jD/9NPbEPqcPGdJnGMWLKW5F84m/wb/iiP78wW8yokv9eJqF2j6pibIDhhtpxlkY/bvg9oSJ KO8/PhlFA+RgpeKZjAk6kAxG76jiaFXt1QRspEu/pEhYFo1DtugfXpYyw6hdP+YV2w94y6ccRcS LvB6f2jek8JX3/yW2V1nJ2M8PlwUvzgPhF1E9/5Jo9XcSQiEqZz0hGXVgqK3IXCAKyURUEbC05v lqF88ptmX6uAYYCNXIFM1waKUZMDwx5KD75KLh2qTejzSADXZ2a+tbhA85LdI620tZ9NjS4qYe8 dGO/wJ5GFMZuBGeTnFNDMyy3GGVDlBMKMnHde4Nb4YOM3RWxtHDQYS7cwNImHU5P79OUuP+i9TA Y7FonsBukEUjfoZQ37bGAphBszCsg7mnQwDwcQGbBzJY5LYaSSEkWUQTrIJ3dQ8Uu0G06UKu5v3 bQif/8XUpuFQZ2GMCW1w3+OgSYDsVnpp4rq7ofUpYTT6V7yI0yWtqFvT2ZnHKUIYjo7/egEfm0Z CVlzLJTbK2Ip/XdB4+T6MhWbGOie3t/91bl1Sy3eDZoLlNrYmnfDIKzQueFiGKDX47dxVVB/pLy y3xAv5M7R6Wn0C50Unagx3s8ia6Us7SDZfeaRbOwCW5JXFpBXYwmnLjlBrpKowPzudJInn3SeAM X/wPxFu SNPqW/rw== 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,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:55 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777807751956899851 X-GMAIL-MSGID: 1777807751956899851 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 svc_i3c_xfer. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Miquel Raynal Cc: Conor Culhane Cc: Alexandre Belloni Cc: linux-i3c@lists.infradead.org Signed-off-by: Kees Cook Reviewed-by: Miquel Raynal Reviewed-by: Gustavo A. R. Silva --- drivers/i3c/master/svc-i3c-master.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i3c/master/svc-i3c-master.c b/drivers/i3c/master/svc-i3c-master.c index 8f8295acdadb..32eca2d6caf0 100644 --- a/drivers/i3c/master/svc-i3c-master.c +++ b/drivers/i3c/master/svc-i3c-master.c @@ -143,7 +143,7 @@ struct svc_i3c_xfer { int ret; unsigned int type; unsigned int ncmds; - struct svc_i3c_cmd cmds[]; + struct svc_i3c_cmd cmds[] __counted_by(ncmds); }; struct svc_i3c_regs_save {