From patchwork Fri Sep 22 17:50:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 143572 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5778701vqi; Fri, 22 Sep 2023 11:13:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGGvEjZILHZKx2cZzNkDiKt6C1/m5+6ZjEhMw8RRlEWB9GfaD6u52LZD42IBmF+ZJ1fkIHY X-Received: by 2002:a17:90a:2b0f:b0:26b:698f:dda7 with SMTP id x15-20020a17090a2b0f00b0026b698fdda7mr471871pjc.32.1695406414434; Fri, 22 Sep 2023 11:13:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695406414; cv=none; d=google.com; s=arc-20160816; b=jGByST1Ps9cN7qK3zBFBdOLSVm4tYSwfCTsEFR95vBydNWcI1NbxPWJaZLQJ+7QwkW 6JONw5V8Eu6Duxu+CBrnbNZixbmWWouSifgyPpOhobbzu3Yg5LAWBk2d51VsMHVBOqn8 vEpcJjsQ03zxjD7/aJ8/F6wSo7upVjQc2LbqGHQilGGoua8SSYnDTxeP9ZW+sb4YjJEc v/YVVUQ8ZWCXfyYdJiYRTLuofwn2wD5GwzXaVwnshlEGPwfY37DWfzTl7SpMOKaek+Vk qOXiPZk95OotodKLmDRBWDtlQnE6atIMyCCamBQFWRZqVfGOXRuK2JspExTsxYppYaA1 Wxdw== 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=nMOJXPHQhZA0yS0fHoLI/plMshH0rTXOliwF499/DWE=; fh=RFaJ0RworcblCxT+bXjj+JJPcWM7i85dfE68dbqV3UU=; b=oQmO23wCLK1+zo6NmmXa6qZRxLmDFB7rU2wXSIRjV2vGKLBiG+yaqRb7aGAEUO/Zqf KGIe3pUY0ZrjUmrePAOWZgtNEX8FMd/qYxfPxhn45fjdq0xiSgIqPMzv6ikTVmb5I0BN sbTf7dWa1sA5eGevs5/9+G2UW8nkQ56jX+e892oTC8qMspmn7ixQK3YIrE47VvIBQtjf lWdT5UK8edn5DdmK0/IZqa/dPrMz/1GL4bgyMi/w1Vy9fIsUMfbPCXqYBax0q4zHRhMI PVOwOIFO9bd7NPliRnyvPlyZgo5nTTjZtWK8q40gHJNNABftkqmjWd0bRmApOA89IorM xX1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=aebPsJKw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id co2-20020a17090afe8200b0027372e43229si6288658pjb.12.2023.09.22.11.13.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 11:13:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=aebPsJKw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (Postfix) with ESMTP id CD02B83BBDDF; Fri, 22 Sep 2023 10:51:30 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233525AbjIVRvP (ORCPT + 28 others); Fri, 22 Sep 2023 13:51:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233650AbjIVRuz (ORCPT ); Fri, 22 Sep 2023 13:50:55 -0400 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B1E9CCC5 for ; Fri, 22 Sep 2023 10:50:39 -0700 (PDT) Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-1c453379020so21078565ad.1 for ; Fri, 22 Sep 2023 10:50:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695405039; x=1696009839; 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=nMOJXPHQhZA0yS0fHoLI/plMshH0rTXOliwF499/DWE=; b=aebPsJKwSZViAED+uUauf6NIKp9lGVxeLAaNeiQb0qEOO146GyTAUY37+HL1N1w/Bn QtS74Aa9xYXWMrKI91SrSXqH+bFB1BswMloZL7so5d/6VsVk+UVmK4tG0N983U0GoqAC ZgAeUyODVVX/3yEt0c1WtVs0m9JshJj6WZnwI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695405039; x=1696009839; 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=nMOJXPHQhZA0yS0fHoLI/plMshH0rTXOliwF499/DWE=; b=A5cyPFXc8bl8VWXKv0ac/GG0AtUgNKybKZvjrXBs5QRHAt+9HmG2PLNvkIiG8K7TMk OajETVc1VHwBe4criHp5d5J1kSgessVj9lDlA+b4+0poW6SaCmMYwGrTtsFjVzpDoHBy Cr+OBri0blXU0AGA1xwynPp9QpTM/EZimHstPZZxBRHc7tMGKB8RBkdut3nIdWBTKEvs tnzG32XidS9NofRrUBP4oBmsAqZV8Hrx51d/kgAO2WUloTwsO5CR+H7psId73jAaw6Az OHWHkBdTQ7nfr0iAGrPu0W+vwtQoozQv84r+fEEJOskVlUWocmUOvcmQvKzOuCUBAILe gnHw== X-Gm-Message-State: AOJu0Yxni5PosOID3ggbdhYZRFQ12mICo6kybssyIv7+mij6KzViJBN+ a40dncjGCAAr08GBVPttMleZ2A== X-Received: by 2002:a17:902:9892:b0:1c4:72c9:64ef with SMTP id s18-20020a170902989200b001c472c964efmr180522plp.40.1695405038816; Fri, 22 Sep 2023 10:50:38 -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 ix22-20020a170902f81600b001b05e96d859sm3777350plb.135.2023.09.22.10.50.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:50:38 -0700 (PDT) From: Kees Cook To: Dmitry Torokhov Cc: Kees Cook , linux-input@vger.kernel.org, Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org Subject: [PATCH] input: mt: Annotate struct input_mt with __counted_by Date: Fri, 22 Sep 2023 10:50:37 -0700 Message-Id: <20230922175036.work.762-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1142; i=keescook@chromium.org; h=from:subject:message-id; bh=LEWy0l9zrvVMRn8ts7PWj/kuD09dSrXj4WnAazmlq9A=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlDdPsQMKXeJm0ZhCGVnQLsQjIil2uivmvEwwNv Rzm0/Jc5EeJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQ3T7AAKCRCJcvTf3G3A JmKlEACd7wdpTzCBhXNjMStZK0q7mpoWAr0hNvgGleGXtkF7ihbchHc07XOV5oi29vSWQxoCGK+ A7UqilH4l+s+SjoKasEgekNpcsNlUXnd5SyTJu3U6W75mUkecgGQTjckkOPMaA9J/CvHpHVgW3X 8MzJRaI3wxLRetGWsIe/dJ05u4kqLqfR0dbRv5CS3V9N8qTARLC+X3xfasNxO4nqzjALnb9UZng fWkUTE1dyh6MN0wJGLszYB/snY2r4SUtv8XGRyLAVck/Sh65NPeGwMITGT/bzc0w0Zsvq/E/4BI Lpl0hEYbOGDbqjmsoNfA6pVOrPQCAgHT5C2nUlHDCqqdTL3mvsv2+Pf9o8kFi9hQUQumpSgo1Eo qbSrXyd/LG+ys3iOt1WL8Rs9+/Mc8M8LmCLvUE2cDXnYmJm7c56wkolM+b3GuFE0AQrKc9jnMrj AXxSWEKzMB48nHsnaaOLnB8IO876orcAGoJvPCPzEa67LgSTjV5eqROX10kIz8l+4Vz5YsaQp/m 0yisfYjudZ8duUFfShH58IS6W3CxWKuNVW7x+d68ao2hstJlKFbk/V+mJrUC4QriWao69tsBd+D NtdrU7nVOR4lk9udHmUznHVvxi8YN3pje3duKPp+5O+bnFoh2ptu3/33bWMqKkHemMLKstvXYsf 3iIwQc2 vWZX8QZg== 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 groat.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 (groat.vger.email [0.0.0.0]); Fri, 22 Sep 2023 10:51:31 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777762476434869010 X-GMAIL-MSGID: 1777762476434869010 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 input_mt. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Dmitry Torokhov Cc: linux-input@vger.kernel.org Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva --- include/linux/input/mt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/input/mt.h b/include/linux/input/mt.h index 3b8580bd33c1..2cf89a538b18 100644 --- a/include/linux/input/mt.h +++ b/include/linux/input/mt.h @@ -47,7 +47,7 @@ struct input_mt { unsigned int flags; unsigned int frame; int *red; - struct input_mt_slot slots[]; + struct input_mt_slot slots[] __counted_by(num_slots); }; static inline void input_mt_set_value(struct input_mt_slot *slot,