From patchwork Fri Sep 22 17:52:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 143662 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5866947vqi; Fri, 22 Sep 2023 14:09:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGTG2ONagIAmpC6O2YQmgHDu7KLdQiO6UgdxgaQL1KZXDrP7FPxJVOQNpwuUYHGVvbuf9BH X-Received: by 2002:a05:6a21:a584:b0:14b:7d8b:cbaf with SMTP id gd4-20020a056a21a58400b0014b7d8bcbafmr789293pzc.57.1695416940879; Fri, 22 Sep 2023 14:09:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695416940; cv=none; d=google.com; s=arc-20160816; b=V4HYOoCDXSJ+GTwbh5xChjsCrQt6nP5kS3MZ1EanlCDpO3eunHdZdp3NsrqmydRcqe WC1yYJWRC5Q/MCcEmGEM9LOR97zKCOBJwIv9CyY695KKJaEMzuJhn8NOvYz/balU10Nt qyFKiO1PDr6Jh3qMepCSJ27lN3Pky1knIrZOrPWLaI/7BRadbiAoO2QNl0hYhwt82YQe MdjxRVu6I2vQWOJViqs14G+Sg7CjwfHfSugNlzY/p77uSsca8TdMBmGSx/s0JNFV3u99 SkNlargan5wsErLA+kBd3p8Ibbe8boe5dYIFWYgcBAnDr4bMgZZOaEMHrISB0wFTpjms /SWA== 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=P4lFdFSF/WMtJZ1n0IFqHz6mtLvevkit742tpw5OZis=; fh=IwQooJ5369pDliOH5m4NidRKm132Pq8x6wW8H1eqjdE=; b=NMB1TfwoXo5Q4y5aDq/i+rwou62RV73KbzRnBUZxKQHQGzw802PocleOSVm+6jDXtX t3ppsLaSIbQJh31c0swsl+QRcqgzaY0AsVdoJwZ9V7TJu/uq20+UfPXhp3k5CD6Gid// CisCbMKF1rvvkml9sAh0R8NyoVZ/E55ImuwVktNhd728SWQTuz3n9knVShnA/HcS4h9V W+WQ+QBELLfRsg2J3YM77Moe0C2jvrf9HQ39fe9SbjJFe28vADpA/oYMctHCPEWVDNF8 /engK70lrefiDlYiwGOinHT5P35c3oiMs1lO0plpFjLAMBLgA2+rTa7bnLNfb+81drZv elhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=TUltBHeC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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. [23.128.96.34]) by mx.google.com with ESMTPS id j191-20020a6380c8000000b0056513361b4fsi4391701pgd.741.2023.09.22.14.09.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 14:09:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=TUltBHeC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 C5C3A851DF29; Fri, 22 Sep 2023 10:53:45 -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 S233225AbjIVRxn (ORCPT + 28 others); Fri, 22 Sep 2023 13:53:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233419AbjIVRxV (ORCPT ); Fri, 22 Sep 2023 13:53:21 -0400 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6AEC710C7 for ; Fri, 22 Sep 2023 10:52:13 -0700 (PDT) Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1c3bd829b86so21835025ad.0 for ; Fri, 22 Sep 2023 10:52:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695405133; x=1696009933; 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=P4lFdFSF/WMtJZ1n0IFqHz6mtLvevkit742tpw5OZis=; b=TUltBHeCRYJUzVo8fVnGboc37KWD2XGgCL6pMasy80W4bhqo4tBxLiHWPwkomfGOnn p2S3UeiOUOaoK14y2ATMxh1h/eRsSjtcpz4zOEGZTi58msCxUxAQ38qVJB19e7bHofgx HKvV/9RB7HLpB+ilyMejoIoCHrdxcIllBq1ak= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695405133; x=1696009933; 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=P4lFdFSF/WMtJZ1n0IFqHz6mtLvevkit742tpw5OZis=; b=hG+EVquNp3EVhZbzR3VH7AF9T4cB33BBoMfATAyvY48CcBzbsqy3hcVs5Me3UFhk06 qG/0CczMGhIkl/4ynzCSIByDmbJeV1eWw+e2M2HG70T083kzpUK13yJffnvRENGe14rK hLEZEZGNZ15MdFPt2vuQDRKZiFuxjRAhLaWycb+6IrNRDAtA/Fpq+P30dWx1hc3wIiv6 qG4gL0bfIthY7L5ybRYdPajfKTv7a5i67AvQ0+gbZynuexZLwPH2SELwj98l3lHon7iA fZ+ysTgiEFGF/De4GaqJR+Yknk3xbNYbYDONHcYlBrsSmtXADNFuyQttF1PQq2PS5vMq z5Zg== X-Gm-Message-State: AOJu0YyBnlav0Y1/Qj3+IhrLkv5jPlnSNSLKrRp22iYMFD2UM4R9qWBI ms69dW3W+ENlEC9TDo9UAIhfWg== X-Received: by 2002:a17:902:a407:b0:1c0:aa07:1792 with SMTP id p7-20020a170902a40700b001c0aa071792mr169699plq.36.1695405132793; Fri, 22 Sep 2023 10:52:12 -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 w12-20020a170902e88c00b001c5b8087fe5sm3784878plg.94.2023.09.22.10.52.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:52:12 -0700 (PDT) From: Kees Cook To: Damien Le Moal Cc: Kees Cook , linux-ide@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] libata: Annotate struct ata_cpr_log with __counted_by Date: Fri, 22 Sep 2023 10:52:11 -0700 Message-Id: <20230922175210.work.239-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1046; i=keescook@chromium.org; h=from:subject:message-id; bh=ei96zfUMfrVFB3I3JdJNLz4izHCeTaYCT55cR6z67TQ=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlDdRLFoAwT1mCQLgtm1SMCJS/1dZx+seXgkUyx yYvrZTRLmuJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQ3USwAKCRCJcvTf3G3A Jm/NEACCMtnhoEgknOC6Ec69yaNMsjXyzdjGfPY/uDjWB8+n6l4ZY/abY54yTq6xlFNSbERWzy8 tTgTWRYZDHWLWFGja0Ov7FyVjLOC4LQcdhbsOu31k8bck/BANRCs2UHtkK5AVLxBnVqZ1zDWQNa W2CdnFimXRaOo8wIg4eyi2gKj4pA95HuBP8w4WIzCkuucorP7rfyu5lPvE1/SmwfIf6j89Q2W82 suLkFQycstU6zebJDhPSs+V0gswuVmna0ifYiKJ+CnBVqQE4Vct/HJKGFxycica7769JXfk3DCX /c/MwvwlYinM8lTmzRUjbZVCfPx/mMO4MmSmmIUpl5+BELtQqZ+2TaP8tbJ8gmbLoy4uqx44huH +ks/vzrsMA2RdTm4+mZ+qekAIBc7wlp8EG+heSZ7BqKhgulEnhWg0wuKGID2fo5MlQw8+Ax4Vu7 uxlfbml1ExdKOuuFoD5Iwi8jbQEJYM8fpdArxCmQPCa8MMJ3J9HuCmmX6dtQqQQMS4J9kvDaiTx VQVH4SdBkWJTgt96MILMcCvQNVZLXqimqbWvXGQQ1C7QX+CtwPZiOSI/wteKNiWnSUwc2iMLKFB p45aN0buN27a4uTP2QaKsutqZT1vM/vbj7jSDTlcmLITJjEBl1uMh8SVnPLEYHnfOJvkWs4kjiZ 0d4Giey 7//WndUQ== 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=ham 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:46 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777773514056716560 X-GMAIL-MSGID: 1777773514056716560 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 ata_cpr_log. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Damien Le Moal Cc: linux-ide@vger.kernel.org Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva --- include/linux/libata.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/libata.h b/include/linux/libata.h index 3c17a5053f00..f91e8e7f1c00 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -656,7 +656,7 @@ struct ata_cpr { struct ata_cpr_log { u8 nr_cpr; - struct ata_cpr cpr[]; + struct ata_cpr cpr[] __counted_by(nr_cpr); }; struct ata_device {