From patchwork Fri Sep 22 17:53:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 143633 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5832120vqi; Fri, 22 Sep 2023 12:57:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG9QDRj+kaCL/S4nX0ssB2duWVYlvT/GERUNSApEVj+6O4zmlxyAw6KNw0I6QNcu+iFtNSv X-Received: by 2002:a05:6808:130f:b0:3a8:1906:6a80 with SMTP id y15-20020a056808130f00b003a819066a80mr882195oiv.10.1695412675880; Fri, 22 Sep 2023 12:57:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695412675; cv=none; d=google.com; s=arc-20160816; b=SKUl6G6oTcHoZLk51BF2eYfOm4p4MK2V2bZurrxhzUv4WXin36lv2btJsSn3XrVaSy VeMNPm6Liy9Po0bpUy9Q1zi1qJvcW1DpNKXbU/uhUc6ryjDAzf5sit1viDnCOCutZgzI +KcS4JlkFikMeGgrqkGaEOSBWRBahfqjj2f7AP52iuFyoSxODC++KtqNnzYGRZm6jIbu 78gK0lvSLZP/fmwsFWzGDvUAed2Jo4Qps320lnKJeig9zY0xq6YnM+RlQ3LotA182IaP qqy+F0zBliwmHXVicYQxCsBl8KS/OV32aj3bOycL5kmZaH21usp19t00B/QafYRpiQQK IEJw== 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=35gtyXNkaxV1CbWW0mQ4JhX2sryrgmwmW4Qyfs+/hZM=; fh=/3XoOW3UoPyfYD3kmmXY8SGE8j4Y4YAmvvPxykTFKu8=; b=PNiqNNM4MiD5uqgUJIeriZ8ChBGflfGPlvXVAIeSy9jd6b5b4ZuGzvyaKLD9soSINx yEJR69nlhK7XNXZgkZzZNwUqeozPAfL0JhMGr3yHa3dF0BkNdmqsxkXk1U4VCCiXgauC +2xTBcBTU0QeHvjOZ2WhQHnSP9K9EPfUfNUNHvXXWS3HS44JG5HeDgWSQH4kfqpA5X9b LH0w2yslRiD/JAAmxtBd9jNrr+KU8qwrh9eARn4FhQ0YGsaGzZvCttjmokm1w4yIimP+ JyvLKNC25Cltkv7A5LX9KG0vJWDITWYI7JqDzNhXc1CnP0Vl6PoJ9/XCxrQ23C0f+Pc8 4LCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=O1LITAYt; 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 n13-20020a65488d000000b0055be9543340si4321940pgs.872.2023.09.22.12.57.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 12:57:55 -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=O1LITAYt; 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 64A2B8022857; Fri, 22 Sep 2023 11:06:17 -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 S233668AbjIVSFo (ORCPT + 28 others); Fri, 22 Sep 2023 14:05:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233855AbjIVSFZ (ORCPT ); Fri, 22 Sep 2023 14:05:25 -0400 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CA702D5D for ; Fri, 22 Sep 2023 10:53:40 -0700 (PDT) Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-68bed2c786eso2275875b3a.0 for ; Fri, 22 Sep 2023 10:53:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695405220; x=1696010020; 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=35gtyXNkaxV1CbWW0mQ4JhX2sryrgmwmW4Qyfs+/hZM=; b=O1LITAYt09swLRrJp8fve4IBMIdWFNCx9cj/PVDl+xTVKojkfdkar4gw2RNcJeg0AQ SLGJ7GkgN98SKzK/bT7hWDqC3ziLqT3SnA1Nn/T4aVxNYaPc6hcY7pRVwhmOYgakMvcS mhovKq7rDOgoZwOzpngygNSPNxWdb/o6CMgW4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695405220; x=1696010020; 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=35gtyXNkaxV1CbWW0mQ4JhX2sryrgmwmW4Qyfs+/hZM=; b=MJ00vwjUTnCPkjl2j4Srx8v9ou7DE9miopNKEozyLuozewTGXvVETFz1XBZ1cr47/H KPTHwpOmIXcB8ZCVJIVU78mBsyzMBRyG/D8QDzVSMQpdvWYWaPoElmxdSJOcbx1w6cwA kw++VnlmyN+Gfog9E2YE+AOSnx+D9FZIdOmJBHyiR0/IPualPQ/si16cBQFwM0ngyDZn l31RLjPHuEX0gAO/c+rxT3rEzaddpOtVBYl8FNUW6pCvPF25l1GExXJQffMNwGMwkbMj A4vkSj4pjwtICm9ZwyixyxgJ55taU4xO9myvakh59BeLVdmXQZwRhtKhH0hcA7VtMt8E 0FWg== X-Gm-Message-State: AOJu0YwM9Vx+zoDR8Dn4Gb8danam++EZq/W8R5aLkVYPBwE9T1kNDt9g qKz2nITZgzGF6Sd6GkpPG/AaPA== X-Received: by 2002:a05:6a00:987:b0:690:41a1:9b64 with SMTP id u7-20020a056a00098700b0069041a19b64mr90043pfg.1.1695405219712; Fri, 22 Sep 2023 10:53:39 -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 k130-20020a636f88000000b00563c1aa277asm3380555pgc.6.2023.09.22.10.53.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:53:39 -0700 (PDT) From: Kees Cook To: Lee Jones Cc: Kees Cook , Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org Subject: [PATCH] mfd: iqs62x: Annotate struct iqs62x_fw_blk with __counted_by Date: Fri, 22 Sep 2023 10:53:38 -0700 Message-Id: <20230922175337.work.150-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=969; i=keescook@chromium.org; h=from:subject:message-id; bh=40smk5nu73u0vfTxfrOWAC2AnRabVPFAKtr9H6m06to=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlDdSierso3cLUCkrGkR7SzFR8Eef9SkFGVBB++ YGtQ3yHy4yJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQ3UogAKCRCJcvTf3G3A JjquEACNQ40A/dsuVWJtubBKqSUsV0RJy532o2a7KjsWRrhyAnUAyi95GcYxhpG1L2yeF3MdMBy thxxRTReJNGXfQwmqfsJQ1QMrDTWiVR7zXFq5mo7Uo/enLd1chriGNT+rMx1UvBuwOLj05zOchw MSpEKITLwGLx+YA0K02TZ9/3rt1ErYIX0xbTAPHcD+EP+T9uzKev2zNvbMj+kEmK0/Lkh1PVktA zHTyOqFn3coTptKLxDpkMJyWSlBeXb/lrvFYjaa3H45C3osBppBcKPGod9MMJAM/x73a6J5RzZc JfO5z5UsvwydKhrtUS+uoO+uEnIm7d7kYexmfe4FXQvJTMudNyH2MI8q2mXBo378A5PDkKLYeYF Ri2c4Ja+5VeIqpcCaxVGKngmTnT0Omlv6wHBT3zl1sCiRvqdEHf5lxIh+US/TTK+9F1l9ZdKnYv wQcUkUsep2ZxvWKHD/M1kQaxEzuEsA0oyGgO7iXmIW8HySZDT+Ii74EgmLDg+UxG+2xH2uZ09rp 07Qqy8qtTiZdDo7eAptBkGmie70Sn4C2VdJl3XVF31DeU3ZKLNEQwbF1J73d4L61K3oeEtz0x7R IYmgjByteN3WXc4sxL30VJTXfnaZOz56zFsyPX5CmOPfIGOPu1q1pZrn9wEco3Clbbj8y4I0omy GNCQZNPa TRkH0iQ== 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 11:06:17 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777769041719458802 X-GMAIL-MSGID: 1777769041719458802 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 iqs62x_fw_blk. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Lee Jones Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva --- drivers/mfd/iqs62x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mfd/iqs62x.c b/drivers/mfd/iqs62x.c index e03b4d38fbb0..1b465590567c 100644 --- a/drivers/mfd/iqs62x.c +++ b/drivers/mfd/iqs62x.c @@ -96,7 +96,7 @@ struct iqs62x_fw_blk { u8 addr; u8 mask; u8 len; - u8 data[]; + u8 data[] __counted_by(len); }; struct iqs62x_info {