Message ID | 20230915201427.never.771-kees@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp1443707vqi; Fri, 15 Sep 2023 19:43:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE2xXtn4ZZKfqb4fPgs0QUbPXvrwOc4KLrRr0AGcZZ3YnVuo6oiqc//J4bRhJCaEXOvfvbe X-Received: by 2002:a05:6a00:2283:b0:690:25fb:bac1 with SMTP id f3-20020a056a00228300b0069025fbbac1mr4095281pfe.18.1694832211469; Fri, 15 Sep 2023 19:43:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694832211; cv=none; d=google.com; s=arc-20160816; b=g+3yL6lH0J9CWifTJ4YOYa5+PLYkEqHUa3ioHejXJ6QwJunFmoeTEZ9CbO/18R2wbM FraMDel2hbNjg/AlQcqfQp/7YPb099nqhYagjsxriW3e1K3IyCYnfCr6SWfad0rd5Bvx GqyQlLXEYeHaUk5tXgC3fpNNkX1/Xin01hoWE9Ufx8dTxO9hLJ+NjoN4rjgH5ZFejUei YhxAXm/OVGafbpnu8YRvDBO5HF8oPxNum+LRfWNYau1UHzxded0PK2VKBwbqfDDSbAXN YeP5+gnB4BpoZzZEeXGb0q6ePnwunS/S0ueth6rbtoSTPtodC2EZN62qSIP0NRCGt7e/ E82A== 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=A3Wh5MfEW3doYb+GVlaZ1d5YV1bGIeT17SJ+vtMao2k=; fh=kBWotlSuoMZR5RaCDHdMtHhPEltjjwKIJapWZ2RSZ14=; b=cM6NU74IaujGMiRyV2YmSya5rZoFgT5Z/IP/wPQPfHu7OopxCT6dsQx6ZVg4UdfZkD /NKUHKV1io5A217xeaWo1oW1A4V0NYkU5RgA9HtTzqCazbtTTvrdQYDkHcYCUiL8mXAL BCPZv6KKXFsbDD16jUMfAhx8oWLUL2UL6d7zV/IDAxobSreGNJvqhrRNASFVffouOxEg BPlChw2mEtZl6YtFSBck8+e0hqvLfbne81v3YPSZuOI1UyvlrR0u7er4Uel+zTpj0o+u HTgWZxMPcSKkDlaaEb+f26IhVlGRHWsouPEOO1OsomNOtugJPIh8VGHRC4PnrrvK7eFt 7Vuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="QEepu/aL"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id g17-20020a056a001a1100b0069023e4bca8si4270192pfv.214.2023.09.15.19.43.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 19:43:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="QEepu/aL"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id D450682D7C65; Fri, 15 Sep 2023 13:16:16 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237167AbjIOUPl (ORCPT <rfc822;realc9580@gmail.com> + 29 others); Fri, 15 Sep 2023 16:15:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237090AbjIOUPK (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 15 Sep 2023 16:15:10 -0400 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E97812727 for <linux-kernel@vger.kernel.org>; Fri, 15 Sep 2023 13:14:29 -0700 (PDT) Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-1c0db66af1bso20027665ad.2 for <linux-kernel@vger.kernel.org>; Fri, 15 Sep 2023 13:14:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1694808869; x=1695413669; 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=A3Wh5MfEW3doYb+GVlaZ1d5YV1bGIeT17SJ+vtMao2k=; b=QEepu/aLtY4qccwIvqqABP1w/H5WEr5RFGpEbJoComvzU2Ma0vlgZLz39dELfEPlh/ Zib0Szi/qK+/dE8Vsx8ym4naerTfh4HtNo9788bMMaTGDKrMV/B+WQytjXdPKeF8BK8F oh3YZEeUTWGQMzeU/5g9boONIJKcfvn6cCAKc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694808869; x=1695413669; 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=A3Wh5MfEW3doYb+GVlaZ1d5YV1bGIeT17SJ+vtMao2k=; b=cNjEXqje2VcABmH/175Nu4EpY0/DP+ts2XTNKdQx7smeYK8fev4+FJv+Jj6CjB5PiF mNW6+sCJzV2fYG8BO7XFjS4RFzPixgiBkWc0kIb4t6/749/fhN3g/CMo9x74mYBrLkr+ S5HLm6RnlkFNwipNrg4gFp12p084T9eeER+4faka2Intv9qXD+OTm8yDGO3AdR8cPn2L YZmFNf3pSEcZRhwpcoVvCxs1j9k+yFHYfN3/nLDny7iALEd5A8smyxX6NIRPE+iEuFpF GfjOGFiX4SeocHUcPsGxLK/9KV1kwe+Wtsl8G5MzaU9ie3IFiVDwuji/R+cfvEtufNPE 8bHQ== X-Gm-Message-State: AOJu0Yze2FKzGgouV4NVbCBB1eZ+snznYF/7FCOtEw3lzYqLlZpHYc8W oIHs8ZkTbeLAUqOdb4Ttt6c+1Q== X-Received: by 2002:a17:902:d50c:b0:1c3:6e38:3943 with SMTP id b12-20020a170902d50c00b001c36e383943mr3120478plg.56.1694808869471; Fri, 15 Sep 2023 13:14:29 -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 jo5-20020a170903054500b001bf6ea340b3sm3862047plb.116.2023.09.15.13.14.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 13:14:29 -0700 (PDT) From: Kees Cook <keescook@chromium.org> To: Trond Myklebust <trond.myklebust@hammerspace.com> Cc: Kees Cook <keescook@chromium.org>, Anna Schumaker <anna@kernel.org>, "Gustavo A. R. Silva" <gustavoars@kernel.org>, linux-nfs@vger.kernel.org, Nathan Chancellor <nathan@kernel.org>, Nick Desaulniers <ndesaulniers@google.com>, Tom Rix <trix@redhat.com>, linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org Subject: [PATCH] nfs41: Annotate struct nfs4_file_layout_dsaddr with __counted_by Date: Fri, 15 Sep 2023 13:14:27 -0700 Message-Id: <20230915201427.never.771-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1274; i=keescook@chromium.org; h=from:subject:message-id; bh=SaTfK3lpyJSSyLqYo6bry2dArg3sE8XflweiHaoI8UY=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlBLsj9eKEqvjp1mnrSMAJ82NDlddaXaFNP2mEl nX0LeLPnkmJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQS7IwAKCRCJcvTf3G3A Jvx7EACzMY8uhS+c29WkzR+uaQe8YM8IcRIE0an3Tp3hKSe4Qsn1YrfptQ703/ZjufltQQYwTK3 6crA9Yqboe7PhB0+QXPWy2sDykXcFrS6Vp/KnGPy6cOziCBe/5r9+SduZZFUM7kurcHYoPCRL3a CYFSSoc0FbnHy4/I/lJpEjD+d/k76EhTwB+gshyW3Ex+75+OVjbhKm2NRWL1aFaaxeEJ10+Qnp0 KN5Ij/AJSHXVq03irD6Iqb92YAAWXBqOhdo1TtabuKyRlGMdu7kjb08LbqpT615kH4fA2tdPaxg Fd1x5FBMj4k+f/9czeX3Zd/cr6rfbWLW2U5V04s5lCfITXMi+HoZRpqgQq1YGa4hnFab+wEf2Qd oaWkKawR6Li0KzJgKwW/OjxaMdCePA0hgElbqQF39q91h1Kij3CJYRVgO2lBBOCRGNAfGtggf30 7LJM2oJGbnRSclIUk6put5bdwX2nVY2K36q4Yw62aNAkK/0ByIRQW8hF/JFK0aFG7TxkIuTXQWA GpI0cnh6EFwilcg2I83Kwehss0Ap5NENU4OV64sWydaTwMMd0FcR/fOZ/1SUTABgqKmFUObRZL9 kNg/SgUzv8YvFDXlSyfqW2siixtbL+sg6XdEwweO+Dp14SLWUYsHV8UWWdYHZwM2cj+DcaPOmoP MKF+K9t McubGENA== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Content-Transfer-Encoding: 8bit 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 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 15 Sep 2023 13:16:16 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777160380881458312 X-GMAIL-MSGID: 1777160380881458312 |
Series |
nfs41: Annotate struct nfs4_file_layout_dsaddr with __counted_by
|
|
Commit Message
Kees Cook
Sept. 15, 2023, 8:14 p.m. UTC
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 nfs4_file_layout_dsaddr.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc: Trond Myklebust <trond.myklebust@hammerspace.com>
Cc: Anna Schumaker <anna@kernel.org>
Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
fs/nfs/filelayout/filelayout.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On Fri, 15 Sep 2023 13:14:27 -0700, Kees Cook wrote: > 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 nfs4_file_layout_dsaddr. > > [...] Applied to for-next/hardening, thanks! [1/1] nfs41: Annotate struct nfs4_file_layout_dsaddr with __counted_by https://git.kernel.org/kees/c/4d8e2b2fb0cf Take care,
diff --git a/fs/nfs/filelayout/filelayout.h b/fs/nfs/filelayout/filelayout.h index aed0748fd6ec..c7bb5da93307 100644 --- a/fs/nfs/filelayout/filelayout.h +++ b/fs/nfs/filelayout/filelayout.h @@ -51,7 +51,7 @@ struct nfs4_file_layout_dsaddr { u32 stripe_count; u8 *stripe_indices; u32 ds_num; - struct nfs4_pnfs_ds *ds_list[]; + struct nfs4_pnfs_ds *ds_list[] __counted_by(ds_num); }; struct nfs4_filelayout_segment {