From patchwork Fri Sep 22 17:51:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 143723 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5931745vqi; Fri, 22 Sep 2023 16:44:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGjo8t2JTGYf88SVourlGlsD2XECqcjCepKLj5o7RTVCFftJeq0Um3Hiywa/xK9tqBasA5k X-Received: by 2002:a17:903:2285:b0:1b5:561a:5c9a with SMTP id b5-20020a170903228500b001b5561a5c9amr1083725plh.39.1695426272052; Fri, 22 Sep 2023 16:44:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695426272; cv=none; d=google.com; s=arc-20160816; b=HaU0Y1+ztYCkatoBNPjAUjM1GHvWtKF925kqvng+9/CfgKNc2hTd/pty09kGuTCaB/ 5NlWIDx527HhDmQxrNPCs71MDILadBoM4jMYbquBuJTl0JMJ/o8peEJFG8WXCReNfnsH KdtSz0AUSVs70IJDi3+LXwvdyCi7yEjL72DwEKmiODGQmgvpDCZpeG6H/Y/E2jwzx34r pwhPVz7OrfbyO7EWcArbnpE+ScXzg0pRB07lVJ17OItfAN9NZt9PgqUFY82jP30y7I40 VYA3625BwUTcX7gYCCl0oTY8XEkdzo84+JFdnU+MH1/9dsizVhJkH0iS3I+9V0pW4ih5 xwSA== 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=JsmMQ6krAwAnzPF3fdWBN7ZYXZOUHbuU3lEOUk2NaIQ=; fh=cmIcIfp5nfejlK0bRky9q+RmwvypKrM7jn1FMveMnGM=; b=I+uwmfzVraqbpg4qPKZ7dDe9EgPv8sY3Q+hMtpvTgyDiuEPcyeVcn9zwI/Ks7gBWxH RnFLm4YXjipA1SNITI+uTPhcv2OpC2HLBWVmXRms4MIGKraD/+KMgxVV4V6i7zPPHIAz FWU0NPXkF9Qwqtgni+mVyulcpUn+YYIQW/nuNoaKLh92wE0+9OZfkqighd5V9io3tHOJ vb7avADcBQYqNFG+2X4AO5+1iiEUVP9rulCEtLRKBquH0052jwZluAqYCg7Wz7/6GRin gwuFeRhDVt8vGEafa4InVDkv6zi9IIzByMoCKHrfd4OZQHQd+X93W/ayd8/QCmD+rB4G vYZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="LPoy/G9a"; 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 w20-20020a170902d11400b001bb1504b696si4481456plw.4.2023.09.22.16.44.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 16:44:32 -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="LPoy/G9a"; 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 B758382C6592; Fri, 22 Sep 2023 10:53:13 -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 S232933AbjIVRxM (ORCPT + 28 others); Fri, 22 Sep 2023 13:53:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233642AbjIVRwv (ORCPT ); Fri, 22 Sep 2023 13:52:51 -0400 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9EDC51F28 for ; Fri, 22 Sep 2023 10:51:49 -0700 (PDT) Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-692779f583fso1464321b3a.0 for ; Fri, 22 Sep 2023 10:51:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695405109; x=1696009909; 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=JsmMQ6krAwAnzPF3fdWBN7ZYXZOUHbuU3lEOUk2NaIQ=; b=LPoy/G9abhkVPsnBKjUCM76Wg13WDHJ6ZkBcV+/SYr/f82jneF77FGufyxxMTMSw3D h7vIvC9MKJBIhhfYG1jCdDf5/QCLVQukTfvdstJcb1TlJ6tm5eACP+D+p01uEKZtx8S1 Vk649DpeUfgwloO2bBzEnLb1wWtlw0IwlDO4A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695405109; x=1696009909; 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=JsmMQ6krAwAnzPF3fdWBN7ZYXZOUHbuU3lEOUk2NaIQ=; b=r5vyyaY/jyFODIG01dIquXra9VZRwmnUYr/mqcRgBfUnFeVebzjHgLxqeypSQNJjSH h1s3e4L8SwM6UjapBcvO0BIZgUS+++yRabAPrX9HpKZCGLpGysf3k8hP5IVEQOoxFbLu mdk0hjsnEgavzauqH273xiSb1IDf5WG5EJQazKtjw+TPMzM8A/hFVjYz4oIQZMREusu5 zMNYXeOAALqUSHc8xOysxHCjT5jfiFxTXaX2zPY/m58300EOQZVT4cs5sTQovumqHFaT paWVswtkPO4EVufHhIaPk8mO3eiekpG7xptvIZnG8MqpUs9KfauBnJk0DzgcVMYcK+AP Dp4g== X-Gm-Message-State: AOJu0YyVMVQPc9O6dJX4PB8LbFB3GEvhmBPSCQrcZb/QgAlgr84LOpNp Opm2RF+LgqOLUN+G5PoVkA1jVg== X-Received: by 2002:a05:6a00:2d94:b0:68e:2478:d6c9 with SMTP id fb20-20020a056a002d9400b0068e2478d6c9mr164234pfb.2.1695405108883; Fri, 22 Sep 2023 10:51:48 -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 p10-20020a62ab0a000000b0068790c41ca2sm3472604pff.27.2023.09.22.10.51.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:51:48 -0700 (PDT) From: Kees Cook To: Benson Leung Cc: Kees Cook , Tzung-Bi Shih , Dawei Li , Dmitry Torokhov , Maximilian Luz , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Greg Kroah-Hartman , Jiang Jian , chrome-platform@lists.linux.dev, Nathan Chancellor , Nick Desaulniers , Tom Rix , Hans de Goede , Lee Jones , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org Subject: [PATCH] platform/chrome: wilco_ec: Annotate struct ec_event_queue with __counted_by Date: Fri, 22 Sep 2023 10:51:47 -0700 Message-Id: <20230922175146.work.219-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1524; i=keescook@chromium.org; h=from:subject:message-id; bh=e1ZqynN9loVhS8+oR1i/+utvHCkGfpoIEpm/aYvNyDE=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlDdQy9C+3oWrxbkRNSsFkLrCWSYDM2/sWuxmwC tMv/weV8pCJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQ3UMgAKCRCJcvTf3G3A JsSVEACFH2wrdHPw7AiB5kOrwR8BTwEXFdchI+hhWo9w6mWLv40k/1F5iqb4aU2VNjMok9NaFLT xH0oWaaak/HJFJQX6RNj6ki1evQPTfUSe3r3QKdLJO/66MAsEOwStztGz8gI5QiSXJk5hFha7me /HZFiMeQd1UD4i3TuVB9JBbaNzF5Uj5R8QII6Wg1NoC8CSY3joJVel1baQ6YM5mtdKqAONP00Nc gggO3cUde1R3eel5kJg7ZwJNNvWkk2yAyF8mx3h9E/iZcxQRM6274ADxvQFOayfLQkAV8TAEK1J 8Hg6b3XRMOi0Qklntjcr/+lHcomhoohabMbzSGLGSMwdcovjnxk2xJq/pNnE+gK1hDqxgo3vtHL LmUOKZZwDV4e9Lt6vgXxURSCyYZBAhA5ERxALUfarPlYNtVSzfTVpvp1xNO+YZHckTsnkS4HOpL dA1+s1V5x7zj3ey5aZQBCry/zlGCIoH/OnoLzMt1kNAmYNPQ/e2CPICn9GoaA7qpxK9rLUPrw1A S5mWfprdS5o52qYqbXEm5aOR4v+j9XMnJIYGmi5UWCO4BUARVBd9Ai7pSWdQ8j9udJA5OATCN3U Q9qg6IzzfdFjmAjFiht+mZaQJ73CJObmFpsCn1VscsldTgpngcGnDm+Ft0y1lH6C/KIZyXRs42B Bo26BPB S0FiNjzg== 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:53:13 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777783298546252273 X-GMAIL-MSGID: 1777783298546252273 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 ec_event_queue. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Benson Leung Cc: Tzung-Bi Shih Cc: Dawei Li Cc: Dmitry Torokhov Cc: Maximilian Luz Cc: "Uwe Kleine-König" Cc: Greg Kroah-Hartman Cc: Jiang Jian Cc: chrome-platform@lists.linux.dev Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva --- drivers/platform/chrome/wilco_ec/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/platform/chrome/wilco_ec/event.c b/drivers/platform/chrome/wilco_ec/event.c index a40f60bcefb6..f80a7c83cfba 100644 --- a/drivers/platform/chrome/wilco_ec/event.c +++ b/drivers/platform/chrome/wilco_ec/event.c @@ -95,7 +95,7 @@ struct ec_event_queue { int capacity; int head; int tail; - struct ec_event *entries[]; + struct ec_event *entries[] __counted_by(capacity); }; /* Maximum number of events to store in ec_event_queue */