From patchwork Fri Sep 22 17:50:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 143797 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:910f:0:b0:403:3b70:6f57 with SMTP id r15csp58306vqg; Fri, 22 Sep 2023 20:23:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGAHmaSknJ+0kQZQTdnPamslCih9Ho2Zk6a1m+DuPSUOEaqZwtVOBwb2xEgjpFOXTYM5wUM X-Received: by 2002:a05:6a00:1142:b0:690:1720:aa83 with SMTP id b2-20020a056a00114200b006901720aa83mr1448607pfm.21.1695439416010; Fri, 22 Sep 2023 20:23:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695439415; cv=none; d=google.com; s=arc-20160816; b=SfFExW+fXEFEn90fg811e9LwFyCCjBAwt4Fp86VL5Mn+dvOH3XhB3OjNzyTsSo4A8v CH8tMW9J3+uOnjINs435O/xuAlJVpW3rojFdGXVLPxos7uQRDsBCnOyVZKkO+cVIZFIx q+ZEaqjKqN/Lwzw7EZM57C9FsYHXu7INqmwa/QZhXNj3/7nDRmAlmP2ePRmlp18eNW31 wkNEzUMxMEDGE0YpOYGWkbzXxDgfRPvjPsmcA03Erqogb/9Y1DwpHVFsMkxBwp94toHI Ph9SxPEoRg+vwLEEV2wROSZP86FsJARHf/nrKHr+WYZNNcZqon+KSGMe+OuRTav4haWF 8eXg== 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=TWSYGSx3FRdbqkNwZMkwsIlHC9m+xNwPdqt/ACrT43w=; fh=RFaJ0RworcblCxT+bXjj+JJPcWM7i85dfE68dbqV3UU=; b=ofpW2jRrq93EQFkcI20L1xrlVaTJP7g/iqvx89X5BfHNUEDxxlNQf9ZFJd5RWWeEKe v+o4n5kVoZxcxK4ZO66ksmhsRQES2IulPTpS++qpQON8Jj1iV9rpTn/XkmufRV+JTvVI 9F3LEdWIC4YJne3L5iPvMJJSlnN8hCY7OGkej8GCLMjWmKOzTCqjYWi3fTCOeNSoF9tv Q8kzxkHg8ZM9wow3gf2X2bt4IpSwlsPTsGfoigN3t2ywAdn+0Orib06z3F/oP+gzRxvd hjD/jvf2IYqY8rTr7lstHj3nkng7qLMawI2UhNXlcCY4VxnbCUPl5cagFxlZrjsvZhNj OcCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=YYLnSq+l; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id e16-20020a656890000000b0056da0ae25d1si5098782pgt.831.2023.09.22.20.23.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 20:23:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=YYLnSq+l; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (Postfix) with ESMTP id 0FC69853F283; Fri, 22 Sep 2023 10:51:14 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233588AbjIVRvE (ORCPT + 28 others); Fri, 22 Sep 2023 13:51:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233470AbjIVRun (ORCPT ); Fri, 22 Sep 2023 13:50:43 -0400 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E0EDE47 for ; Fri, 22 Sep 2023 10:50:34 -0700 (PDT) Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-6907e44665bso2248969b3a.1 for ; Fri, 22 Sep 2023 10:50:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695405034; x=1696009834; 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=TWSYGSx3FRdbqkNwZMkwsIlHC9m+xNwPdqt/ACrT43w=; b=YYLnSq+lEMDl2fkai1YHDUHRB0EbjnrR5BDek7ndRwBJ9POxkRB/Cd5l3fCQLErYaE DTz1VdtHLJ25bz1Ba39toltJ/UCQo8QX+1IcKUr9wdvzu0RL0nVvGod6n1unFgrYZsaZ B1OHociFSpwUyLcyhzbPX5Rlq/6lcjgo+EdI8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695405034; x=1696009834; 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=TWSYGSx3FRdbqkNwZMkwsIlHC9m+xNwPdqt/ACrT43w=; b=T9E7ArSwPh3kgnB8A8IObfH747CWJm/bqaiVGXkAgBvdgon76qatvhTiBPetqsnOlU 0htkBEOGe4l3DZJkQVmCaO1iXXI3TSS7/59CZuXNdAFNuF74zpPdqRAwpioE7h7JI4sH hh+oeRC4RsH6vtzk4c70eGErp8ucc4w0M14HfG0dkgTfPLEAFMOUGLuCuViwpmthsbN8 s7LqFgi/tU4hOpne7FtS1PRhB67d9YVGE1ke0T0HXdcRRZLxGcPWNBysNYRoySsYrTK8 sB5QuNVwKC5bCGAjkyM7pJutEHst9c3GLDBCBmnnb7G0CQUk6ZV5lfh5QpZmfcH2ZB1E /3dQ== X-Gm-Message-State: AOJu0YwMIDFQJUIw0jEIkZL0kZH+UF5nqNIbIO47J9Kw7TjnCG52NyIU NI8gTAqnVHWXoHzxIRSs/nyTYA== X-Received: by 2002:a05:6a20:1593:b0:153:73ec:fe67 with SMTP id h19-20020a056a20159300b0015373ecfe67mr283929pzj.19.1695405034029; Fri, 22 Sep 2023 10:50:34 -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 i14-20020aa787ce000000b006900cb919b8sm3471285pfo.53.2023.09.22.10.50.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:50:33 -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 input_leds with __counted_by Date: Fri, 22 Sep 2023 10:50:32 -0700 Message-Id: <20230922175031.work.467-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1178; i=keescook@chromium.org; h=from:subject:message-id; bh=fuFMe5RJqctw9YaNRo3c17jp48a8pQ11kmGxtHC6eHQ=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlDdPnbq9HMyzXg1GM/G+0YODp6B8YDnTmKbwLT IA+uTuHW2WJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQ3T5wAKCRCJcvTf3G3A Jk8tD/9IP0MlS1aUzonY8JdLcDTAkEZzDGSLrIzCT1/R9A885x3lCdurlSZ6lY3uO+qOuGO5wyR CbBFdXNDiCJIilfilYLMXRW+1rKnCF7mL/o3RzTjb9/5r0SQnz7MMH7m93L7KdrAhf/q5haoFyl 8B64XR4QrJfzsYJvfzo7dcc2Wz6KMqlvcA8IlUOr8hEz52rsf4BVwBxXFNyolwrV71JGLB3F4vJ rdavWISvvNKE4WTf2lZsVw0A7zpfba1OB/QHEaoFAjtZvXwfyvwTMrP9nfvaUlzqcVqYa9eRPUR DDNsjb6NSGgHm+Tr8HV5qMOkIUinLcNe6D0aQVOc8mBjpe31oeAqLU39NhHdPsk1gJluYML/DYu LoMiRoW0F9Pgfd7aUvQEk6AoUKw9PIE3ajSXKmDRiGXVLXSk1AXct9jIqXkEJj6deT70tRCMZW9 QiBMYv8IAGZnf9+PE+aeD10dUAKVIsUt9fU4zu0dPfGf5qgumVscQsLnxLR0NF5WP8mlfgBGyOU 2KnpDfX91Hgl3jPHZiEBJbvqg2lFwW683NbrivfaARiT3r/7DTjtDOPHmQ4J8JBr9bLnkIjk2wQ qgHLyg5gUE5ae4SG8RDF++QAMkLnF/nqOz5fPsubL5gdGDlNsZ9wUA9lsegSS2eTcIGU2O1Asj8 dKwVbEr Aum05Q7g== 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 (howler.vger.email [0.0.0.0]); Fri, 22 Sep 2023 10:51:14 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777797081132665253 X-GMAIL-MSGID: 1777797081132665253 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_leds. [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/input-leds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/input-leds.c b/drivers/input/input-leds.c index 0b11990ade46..0e935914bc3a 100644 --- a/drivers/input/input-leds.c +++ b/drivers/input/input-leds.c @@ -44,7 +44,7 @@ struct input_led { struct input_leds { struct input_handle handle; unsigned int num_leds; - struct input_led leds[]; + struct input_led leds[] __counted_by(num_leds); }; static enum led_brightness input_leds_brightness_get(struct led_classdev *cdev)