From patchwork Fri Sep 22 17:50:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 143594 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5800486vqi; Fri, 22 Sep 2023 11:57:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFlvDKylySmee51UkfxOscOB6E1GJ2sisZw/O6pVxeV6/vH3siuF8qOMF0hjGlb5k8bnSeb X-Received: by 2002:a05:6a00:1817:b0:68f:b8ca:b11 with SMTP id y23-20020a056a00181700b0068fb8ca0b11mr312734pfa.11.1695409038904; Fri, 22 Sep 2023 11:57:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695409038; cv=none; d=google.com; s=arc-20160816; b=YyvrqzmX53Jssp0Dr82/EVgQMFcKMwxAKHAZhLaow+3tyvvxhBJVe99NEeD8y22a87 cXODc4JgWM7sTDbwV+On8TaruG0CcItFuCfYyhd0wc3Y98+Ke56PlZnsL3WHGx7OgbyN uqkZmwD8ZkHRRgDz40vp5jQyZQEpCXYsXoTkcRKBqdzEADvpQ8hNA6Mh/CZXrNOW0G+9 p8p5mL3A0b6dI1B0Y1Te40cl44NAIqdg5ALa/erHeGICDaYMcrT8v6KUKKW1pcqL9g4E 4ycZRf/9Zx3sTsZbyW8SbU+RUBKbEx0jY/xu/MH5P4w/RmrbRtA9rg3nW8IHkwRqA9vd DGmw== 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=xrtz1QFozDlH3/nit7ZF/0eGtthYpeLrLWIW05kvAAU=; fh=RFaJ0RworcblCxT+bXjj+JJPcWM7i85dfE68dbqV3UU=; b=Sf+OXiAvAEf4fX76U8HGFt6piXgRFG2OdzpfElONBorL44Uh3RFwOAUz5IT74VAXpm dxdxYu0LtemZ4Kn427QZVmN1JUaT8YSKjFqJDEX1SQf62AqSQxr0e/aYaSPcLqFg7EA2 s6EXJGsRcGxb6JP2Lm1imm+qPVh7viyxBBig+Nznu7yd3l0jkDLRGbqsRrtKtb61x7gr leEQ6pOgJMlCLSTHahE0d2CtuCb3l975/j7rfL2Ne5RGtwMxtsd+3kLnXaYfCEm+fzAP ssOAfJ2IfGk0AAcYJxRX8Wnj7UwMaRPFM9eqc1xwk1SZYMVVUV2NG16HGiAS1zj77NAY BMSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=IMXDEBxn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id n2-20020a632702000000b00563d3ecfb13si4521856pgn.117.2023.09.22.11.57.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 11:57:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=IMXDEBxn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (Postfix) with ESMTP id 636B8803955B; Fri, 22 Sep 2023 10:51:17 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233467AbjIVRvA (ORCPT + 28 others); Fri, 22 Sep 2023 13:51:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233452AbjIVRuk (ORCPT ); Fri, 22 Sep 2023 13:50:40 -0400 Received: from mail-ot1-x32f.google.com (mail-ot1-x32f.google.com [IPv6:2607:f8b0:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D541CCEC for ; Fri, 22 Sep 2023 10:50:30 -0700 (PDT) Received: by mail-ot1-x32f.google.com with SMTP id 46e09a7af769-6c4cbab83aaso420012a34.1 for ; Fri, 22 Sep 2023 10:50:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695405030; x=1696009830; 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=xrtz1QFozDlH3/nit7ZF/0eGtthYpeLrLWIW05kvAAU=; b=IMXDEBxnsaoQverSML88+YIa9U0dITWZMpQV6p926fsOeKkYDacRG2xvvE8WznPdtf T07tmv4/5XQQWMy27COlE73HHXenLBz3kw9/effXmqybZC20Y3dlPHyzGJ6aPo2sj/oX XeqT0Sy2jQe1p534FTUKFiXzzRnQUk9xfum4k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695405030; x=1696009830; 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=xrtz1QFozDlH3/nit7ZF/0eGtthYpeLrLWIW05kvAAU=; b=m41Mr+aYNp83UbMxhhqRtsr28D3CSBIY4Qwi7Ev5wKFUTjerNkZ8FdwgAPBLKeGY1/ kem8VQ4/LUPieSYxGGR3YniC7tQSteccEDS6gDWlVsgocWlZXlNEy4ER7pstEpK/VQkK ccnR2JK+Ho9O+kQyS4IHligcmnL7BSDgaMBdCZ2pLI72eADi3TZbJ7oyYA6sJG4UC2Qp 6M0pc/JzpIg3WKgcD0c08P8wwaxtiADDBwgV7Y6bWPOZn9sipohMJ8SkCjTP+U1ekGgr 9gDEg2UZzrVMR/nEo6Oy9GrTUoeYZVoKf/mNFpdfC91jYSuZzV5HbpkS6MHzdVp68xBJ AMRg== X-Gm-Message-State: AOJu0YyOY0g2cfjuKQou0UoQosZy21lHUne37km5HfVLVc+3VN+HeQbY kgZFWQ1ITa4oYbJuBuQ6crguZA== X-Received: by 2002:a05:6358:27aa:b0:143:8f7f:9150 with SMTP id l42-20020a05635827aa00b001438f7f9150mr360342rwb.13.1695405029982; Fri, 22 Sep 2023 10:50:29 -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 a8-20020a637f08000000b0057d86bb613esm1259916pgd.45.2023.09.22.10.50.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:50:29 -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: Annotate struct evdev_client with __counted_by Date: Fri, 22 Sep 2023 10:50:28 -0700 Message-Id: <20230922175027.work.563-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1135; i=keescook@chromium.org; h=from:subject:message-id; bh=F0Z7qk8WbE9IhwsU20RzqLTm540D9AV3CzIu9FIos2Y=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlDdPjfCweOYJ24fK5QO6nd0/ZcLHSx0EiqUyvr m1XcXMHLxKJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQ3T4wAKCRCJcvTf3G3A JuesEACmgZ7LJ7hzGTmPk4sjXyOwzvRHjPW7AZ5lnEZqS5CAf9LyiS/rXgpw4uGU0ZlR9/CYbEC CoG8fsG7pB7gqgEu+NyGT9wlhpWFp6gEr6LfIQoq5h5QG/BygRUsRAPA/SWjJD3/Ph7SOLMAthq YzsNXZCD0QXwzCICFZ3BnDqiEzau7j3WjNxIARgkVUr2kY0JPd8lBQIvE6GqVClHP01tLiqgbj2 5ZnsuWA2Yb1kkZwfTi3En34dulyGlkwl3NtYmcmSdo8iAbUpkdXL8QnJGhQHlGXh88gYummzjLi ebj7or4i8/Fwsq95c43QxcBdyguuKr/+HubKfvjT8V07aVfNhZdeuodMDCGre8CW2Qpb8r3UjH8 zHemjDdNd16/u6fth2UHJlUt9kF8FoEeiJl+1J11VoqdmPPsfuuuwRCbwB8hK5djmvGay2y5AYi unBmV/C0AKdGP6XZgGhB6mXao3Y6KX6DtdXL0PG0VH1Ukl3iNSBzwRz1IpRmxf0q2ACOq0ZWGO6 BSgRbAWiyvuc+ZG+Sw3zFqBiGE4bc+HoxW5XYUQe+GLkuiTipuB7Xwj8RVc2O45B+6KS4qKgWgg wt1WodmF7XKHVB615egh8bmJrV/8mlbZ16PU0UmnL2BmHymc/BqC7MEHjM9RTvqdMwnmkTFn2/G bT1zU6M 23OjgTHg== 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 lipwig.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 (lipwig.vger.email [0.0.0.0]); Fri, 22 Sep 2023 10:51:17 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777765228397678588 X-GMAIL-MSGID: 1777765228397678588 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 evdev_client. [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 --- drivers/input/evdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 95f90699d2b1..51e0c4954600 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -50,7 +50,7 @@ struct evdev_client { bool revoked; unsigned long *evmasks[EV_CNT]; unsigned int bufsize; - struct input_event buffer[]; + struct input_event buffer[] __counted_by(bufsize); }; static size_t evdev_get_mask_cnt(unsigned int type)