From patchwork Fri Sep 22 17:53:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 143686 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5889817vqi; Fri, 22 Sep 2023 15:03:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHFhF1xjMLjFrjra/v+SzGjLjpB+Zq55l4hIZlh/zvkO+c7QlvNH4H3kh+qn0rx6iooVHWU X-Received: by 2002:a05:6358:912:b0:13a:6748:927d with SMTP id r18-20020a056358091200b0013a6748927dmr855398rwi.0.1695420184574; Fri, 22 Sep 2023 15:03:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695420184; cv=none; d=google.com; s=arc-20160816; b=op3bJFf/IavtNm0snwaWww87gjj6fcMhZrQnr/vSQwFxsU6oCsQQD7teMhUkAXCUHb S0IikfL/BrsnjhP1RLJsa4NtIS6k56KHI9Rs7EtaZ3FJPKADGb3mMi2n6EdSGjECvQv3 FXW2bwHtn/b6EZMEpBb8H6e4hPCPOQj8bSRWQXp/3IaOMRp0g7GDi7lDbbTJHXzcmqOk vsbMkNL5caT106TkPn9w6TRuErXydNCo2ddV77sqHlk//lpTv06VjprEJBWWOwl+q2cY m8SgfelQ2AUYkdCviig2+THG7FAT6AQMTRCBgFlTGGXDPRFUnMzbPNuWuB3IAaWGX6X+ obPw== 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=Cjh4soax71qXdKxx4Uo/pClvCKWvC2l7PYoorMxWqJM=; fh=VTygaNREkxWUBqcZL3+M2ioGwdkd7NrMlFa67Y1aSAw=; b=amhjRk5rNqb9vj/z1oJzGWtmuorOPfI5+cdpsG5dXm+05dUYC6jof4LUs7FwUwSHaU MkpFm26EZlh46gqwfLh4jGCFpkTpmEf1soNA1I9VsCIZsWB4GXCfiZyu73oww77G4ZeO DQA1bGFo+wYxIKJjwM8o2ERUq5v1l9w7E0SkLxT+jBMhJ0wc+9GHVbDDLBpEF1rMFXiw H/wNa/m1yMZGJO2WK63mPGcLgriCXK+zD64fFlgB5qUiGAAv6/y6/VmgwhlXwL1yFJ9X S/T0ediA9ZLJDZ+oNF8svMKxS8n/t6le2YSZ2pnD20sSiajW/U+at4cA30ipB81/ptOz mxdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=PeaIFsPV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id g127-20020a636b85000000b00573f9a427d6si4281861pgc.450.2023.09.22.15.03.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 15:03:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=PeaIFsPV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id E5456820BDDF; Fri, 22 Sep 2023 11:06:12 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233713AbjIVSFs (ORCPT + 28 others); Fri, 22 Sep 2023 14:05:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233857AbjIVSFZ (ORCPT ); Fri, 22 Sep 2023 14:05:25 -0400 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B6D330C0 for ; Fri, 22 Sep 2023 10:53:50 -0700 (PDT) Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-1bdf4752c3cso20391515ad.2 for ; Fri, 22 Sep 2023 10:53:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695405230; x=1696010030; 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=Cjh4soax71qXdKxx4Uo/pClvCKWvC2l7PYoorMxWqJM=; b=PeaIFsPV+UfCkLCRtMmx+jIgufa+thGTnpZJbcvse27KvuO11ZjLVV4By/9vLG/kMF gvLLjP5SKlsOqVGSDnMTxMDpx3Jznf7VOxwYBnGl36UYZwxQSvioDjHvIA8SOrplLbqG 3MZW3w8FUvhFy6tivwMq0RhTOxsPAVbftqKLc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695405230; x=1696010030; 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=Cjh4soax71qXdKxx4Uo/pClvCKWvC2l7PYoorMxWqJM=; b=D+MpbJuC1lSPlB8Wsc9xWso5n0BbX/OgPnMdZ0ZhfRrD1bZ4ZPSYSuxSIKJZeoI4nJ RA2kdeuZ2PY3V84ZwXLU4MNPaIfKi7+LZvet3MQpqAPQpTNWx8tZ0yiSMjl5NBEG9TZy fZcf1iG3iDU/7EyQcBwCsioA56CQQFfIJHOq8pxnw7jhdDDvxqHMmQ+fZDsx4+AUZ0nk kgJ1YnA4BfqhY3k/d9raGPcOXZHLyjqY+//FR7u95oZ+wqcAJLQoIFLhX6gJstnblGIa HzL4d6OjkHw439ZtH8CEqfJD+zhbcNxm5em8UXrtB9Y6Znad32vrlb7V6rdxq08+taJP IUUA== X-Gm-Message-State: AOJu0Yxh+/9RoFmZMXfjYRL7nYFs054xjG/+kcBd4kVgseoxF79DpD9S pLNLjNFswzQV7ye53tR1GW4fSQ== X-Received: by 2002:a17:902:e807:b0:1c5:9c73:c91c with SMTP id u7-20020a170902e80700b001c59c73c91cmr185786plg.48.1695405230042; Fri, 22 Sep 2023 10:53:50 -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 p21-20020a170902ead500b001a98f844e60sm3784484pld.263.2023.09.22.10.53.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:53:49 -0700 (PDT) From: Kees Cook To: Clemens Ladisch Cc: Kees Cook , Arnd Bergmann , Greg Kroah-Hartman , Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org Subject: [PATCH] hpet: Annotate struct hpets with __counted_by Date: Fri, 22 Sep 2023 10:53:48 -0700 Message-Id: <20230922175348.work.056-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1134; i=keescook@chromium.org; h=from:subject:message-id; bh=fMklDMYM+o2FhB8yiVei6HsERV+0CtPP6utTcRXMf8Q=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlDdSssZpoVdwFzg8xBswKKIRawVGSvV3UwBeM7 R1x/C4Yco2JAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQ3UrAAKCRCJcvTf3G3A JrR7EACOhs429mzPOFticPW8qF58H+j8y1aVpI1PN+aosr9aqqI2sHcYO6fGBfSPqEgIwKTgt1e +5SLoOtIh11e8J2Fol4nXV3mr4S9NWMAUK5hpelP4hd5ZXD0mmS5yyeiGX2r5WHcTZ8h5GQQV15 yyT4Px1LMDIBAUuKYZfSVNRTyHzyKClhA/oRusNDybVpf/MV0j+R9uhszLuVenI+osP6Apohz85 9LoG4NMbrt5Id+qbz8kQuHr+bUE7tFYi0sGaIZcIijAhxhxqeVRtz3yn59mOXEjQsusOoO+dkzH TTmDcoRIX3thpWjIal+RDLNWPXSX6fH9iarnjG3gUA4kK1Z9L8BdCVJQDf1BaASjUfA6XSXD1lH adXNFCefmIilu5jcGX63B3OrP/lfn4ZOQycXsUJ17c3ATAlaVODvIUe+EwKnN8h05Gfz38b6RX3 OMY+DY32IgIiUu9SalJuVh4cneg86WUR6Y78THUT94gE1MtdD72C5hhCiJhDmY4F1oSUfhBBfj5 Yvz1wTQyl1AFFL/ijVNOjxxwnwWHoMz3jOeq+CBkzbHo704QLp7SEKfWsE745FFoqs+4VNzGgpH cnynF2EJvviovzpVDnNnMAu/wZPdUaokf7qFnmGBgiG6mnzfBoz398FYvEflvv8lhtSc2L59ARE 1abYFQx rayFkXYA== 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 agentk.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 (agentk.vger.email [0.0.0.0]); Fri, 22 Sep 2023 11:06:13 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777776915401069655 X-GMAIL-MSGID: 1777776915401069655 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 hpets. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Clemens Ladisch Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva --- drivers/char/hpet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index 3b2159416e62..807c389510de 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c @@ -92,7 +92,7 @@ struct hpets { unsigned long hp_delta; unsigned int hp_ntimer; unsigned int hp_which; - struct hpet_dev hp_dev[]; + struct hpet_dev hp_dev[] __counted_by(hp_ntimer); }; static struct hpets *hpets;