From patchwork Fri Sep 22 17:51:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 143696 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5896833vqi; Fri, 22 Sep 2023 15:16:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF758XnPmlAARl2/irvkgI9WMBVDkF/9vU7vi2ckkVJh2u9zbCEkOcyrKYUwvWG1BGaFaS3 X-Received: by 2002:a05:6a00:1508:b0:690:b7a1:ac51 with SMTP id q8-20020a056a00150800b00690b7a1ac51mr748112pfu.31.1695420999376; Fri, 22 Sep 2023 15:16:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695420999; cv=none; d=google.com; s=arc-20160816; b=UuMAXD2SjcSQHg/9AgIQrRG/wPMJH+ZYcANLqfxPjkcYn4RY+nKM+iAsO/aXNkFCy7 /qkcYHpn5ComnOpv1cogghHagVXGvg9f7+WUBipYA4nMfPWJ2kmK+7WmqHb0LIxSLcD0 iYPfJxG183pLrMZZi4Hy+u1dQKBvcqBemR9HxXmkgixwVeqitla4zGUfEDQFv4Zb1Uv7 h/MHUfViVLpNZ7TmlAU92iDkSNZV3iJevk5PTKbQWQCoDQO3PgABOdiXrEPGcKRLzIrg aC69djceuWfd3Oz74U03hxPyDQ/hHVUAA25RMHeGgvAjFYls8sPH2f0TsNc2+X+2+Yg+ sgrQ== 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=LMP6Eo/vaMIazZNY5B2EIxzC5JUt58mRyjJ2WHITWvc=; fh=eQJrwhKX/dSVVy9UAGwZY96UCpOzW/QdV0NL2Jfuy1w=; b=i8r3e1oJ6iYe51OJGtCeMndH947gJObyT1Rg6+Zmb3toAVbmpLxlEwA1CAUKv/VU5n cWeOugUGbu2T9ptkN7C2jv2zogP/rJL3QHe+8i0qoN8HrOja99CN4XYWuQ3rpu4B4mj4 ek8LgBmBBkNkgCioo75jcQ0dvWf7jI17wCs0QJtLkhXsHVsBHoeZxLZtwdnQE+jSC8tj X6WjhjFxU97JPQeVbwN0v1rSzceUXB+NS6vC70B/rbdER4W1ExGflaveLqGIpo1EsoIG hE3qZDLamqrvC5boEgrLqwbQF9aAJWqMjqN1zBJ5Dyc+bV30/wV09sVwGYs1RejDHreO WwWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=EXVamoRZ; 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 t41-20020a056a0013a900b0068fbf6ba315si4976486pfg.233.2023.09.22.15.16.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 15:16:39 -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=EXVamoRZ; 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 674848514B0E; Fri, 22 Sep 2023 10:53:34 -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 S233187AbjIVRxZ (ORCPT + 28 others); Fri, 22 Sep 2023 13:53:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233559AbjIVRxH (ORCPT ); Fri, 22 Sep 2023 13:53:07 -0400 Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 228C11727 for ; Fri, 22 Sep 2023 10:51:58 -0700 (PDT) Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-690fa0eea3cso2266183b3a.0 for ; Fri, 22 Sep 2023 10:51:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695405117; x=1696009917; 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=LMP6Eo/vaMIazZNY5B2EIxzC5JUt58mRyjJ2WHITWvc=; b=EXVamoRZkEedTX2JhbRhHnxZSe33ND2+9sr7vmkR1nGNQOrqxgczFuEN27qT3RV9n+ m1QtmBForVG0oajKGziFwhY7vAGLcEj6V4VY0DE0FwbDpAVQEGlr5Q97EHf9oarW7uFl Ymp7T6gkdlHZ150KOvoltstzse+coUk5b5t8o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695405117; x=1696009917; 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=LMP6Eo/vaMIazZNY5B2EIxzC5JUt58mRyjJ2WHITWvc=; b=nYKPSyJxVRRJGUKtewdiYbaQDdAlA94i9arHU2/hYMNr0Yj1gTBcg4vu1sKBXrshA9 8WczWtOdNn1G7FzAi2HQ9UxvXtuRtmLvD7OCoC8Xh+Je2YZhukW9n+CDdLV/nWUrfPTt jUl2uiR1ubFxcYIO+IMW32o8SfyLMNoKfeaQ/CXLqvgZIS/IfXSpRKjUbNf/ssb0/nrR HXXw019LNvyby+ehv3wqD0gkut+ZqQ75z2P44Yhk6kOhaFqFeyV4GqxXmilOFzBE80rx mWF4Qz9XJqsIRaZ3oGigWBLJsgjebca6kaILPCRtGY+//a66n+9WnMDQfioHkwUAOI25 qRyw== X-Gm-Message-State: AOJu0Yx/jK9sLTjIh7w+jxSt8Xmj+mRJMPuQW3wgbXHWQMC5eS9jMcx6 TCEGBvIGmGd7QNkNt4IF0NNOFA== X-Received: by 2002:a05:6a21:a586:b0:159:fe1d:2f09 with SMTP id gd6-20020a056a21a58600b00159fe1d2f09mr307564pzc.6.1695405117494; Fri, 22 Sep 2023 10:51:57 -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 e5-20020a62ee05000000b0069069ca9814sm3463168pfi.219.2023.09.22.10.51.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:51:57 -0700 (PDT) From: Kees Cook To: Bartosz Golaszewski Cc: Kees Cook , Arnd Bergmann , Greg Kroah-Hartman , linux-i2c@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] eeprom: at24: Annotate struct at24_data with __counted_by Date: Fri, 22 Sep 2023 10:51:55 -0700 Message-Id: <20230922175155.work.872-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1169; i=keescook@chromium.org; h=from:subject:message-id; bh=DIpsB/ou/Bn4dXxGISBN9wBhUC+HRqEPU3gJ+srAuCA=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlDdQ77Iev/RbO+fPKpsBUGVaL7crbXoZB/KWdF Xqifi3aarSJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQ3UOwAKCRCJcvTf3G3A Juo/EACZ6Od5Kn99qc5leb8EtaCoZDT1wKVq+FCHfwf1oDM9tMGvk0gt7nu+QQmrcgu/+nCNpy5 pGVC8+lAd7xQZlw+YzjGV/ogHKK/cKbtCpl2xoPrs4RUzNEqCbNm3VIjRII1D7Wr9wg5A+mg//0 10ZhtU7LlSGXqp9TM97DojKy2hS7JFzb/WRCX6Ns6a/XahbuncnM9zNLz5fjqkg0d76a88Ys6Sj reiGEku7RQWZQSp0sBw8CGdD/gJOcEaS5FXe4dJ+1pXWmH+0q0sfXCZWBBxItKOU8wZpNxlRVtB HLlbLc1cz3FMEielQXectGA4SXvdNa4WObULLyPwpdiH8m18LkVNGjuGSGgsgJoWOdhy0BNs7Yy Ptb9Xg1aLq6fzqnS6Be7NqOFofukMU6arKsgvWxJZOmL4atQ8ja//EHhssObOi9A3aUBXbihMrp czGAc27Qc37LZP7iXq76h462Rv6uRlhIdUUusZUFRF0ooHmsnxXRcVUI8WFRAAsN3xEVxyAVFA0 OfXe9C6EV2sAmkapNTAc8VU7lzH2iqwTAklmAsqle3aYC7GbJZ5xcpixKadpgxbwlV4my4kJw5f blbAi1WprMuKKNiUqZ3bg0MlZ8Yb5NBJxLJqwSwL3kvhUVTUSOrCXvmv8zDkJqxcgUQigoBq/U7 8ekvNsl G0KklGmw== 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_BLOCKED,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:53:34 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777777770134809388 X-GMAIL-MSGID: 1777777770134809388 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 at24_data. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Bartosz Golaszewski Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Cc: linux-i2c@vger.kernel.org Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva --- drivers/misc/eeprom/at24.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index af83aca452b7..7dfd7fdb423e 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -92,7 +92,7 @@ struct at24_data { * them for us. */ u8 bank_addr_shift; - struct regmap *client_regmaps[]; + struct regmap *client_regmaps[] __counted_by(num_addresses); }; /*