Message ID | 20230915201434.never.346-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 h50csp1348799vqi; Fri, 15 Sep 2023 15:12:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IErbxITiwz9FsXJThYMMvZBjB2r3XHNuw9CkRfozFO19Y7HTSYJqD7Pzng547qD1gmcsP+t X-Received: by 2002:a17:902:ee41:b0:1c3:661b:e43 with SMTP id 1-20020a170902ee4100b001c3661b0e43mr2965766plo.31.1694815940866; Fri, 15 Sep 2023 15:12:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694815940; cv=none; d=google.com; s=arc-20160816; b=qcZGg/VE1+LSflr3ACYzIqVebkWafQmnpCw1pP6lGvPXtrqCpYt/8v4UlzH9m90P8y xxbfNF1zqC4DHADjPZIDAI7VaXapiVTNdkb9zncrhSU4s6gfsheZDIpZ/FN9sabiQ/20 HHYJst3U3JaITko55Mjw+bNlZgRkhbOk3o/FiL0P19mUormAtoRPrvIQkf7j76G8C7XI pugiMuIO+awS5DEZxyxgNAlh/wF0IgmgttsH6OKUy8aXXaM4ibVErziDxOB0de9WMXwI j8KHVhbkWiBzWJrhR8/8MfjX6CCNKYpIx80wRmoTxiSV0LiTZlkP1rjxvuLAHX0vkw/k SmUw== 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=qkNg/tr3QrWcASJiKwsE4eOsWfikvegDZMItdS4GDes=; fh=1OAnMKG9qrXtlbrKiVQxgFcUNENwm3OGkVyb+e3enAQ=; b=VoT97G68uZAJB4G5dKxwU19Sxl9HCsK2sGncpBRZ1ganQrRfFPQLIAGjLBFuji/B6j IThZ/ToJxCimvVvze0yLwnzQIE1qSpMoS8WAlVs85BBhvCByzhkTy6FnXFpJojjVGP0m IMyhkO/d1w84wtHybvWTMEXg5rEQ4/K2ednt0WA4YE0Jfh56/Jggi3BWH3rB7dYfIahE jh8KeHCPoQTLvl0PiSgRlBRPpZrAAPwEy8UxTemJq8cgUQxcE8mIKnEbBasS/ZCb2Dir eD+kE5Ullwjm0x4KllDpCgwQswI6lr4CqEQjyQVzGOzXms/Qd7tRjQkHXW+7ZHLhtp/P 2p4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=dIQOpXFo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id m1-20020a170902d18100b001c4401a7e18si1039523plb.382.2023.09.15.15.12.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 15:12:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=dIQOpXFo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (Postfix) with ESMTP id 047D1828CC00; Fri, 15 Sep 2023 13:16:32 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237271AbjIOUPo (ORCPT <rfc822;realc9580@gmail.com> + 29 others); Fri, 15 Sep 2023 16:15:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237409AbjIOUPX (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 15 Sep 2023 16:15:23 -0400 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87A4A30FB for <linux-kernel@vger.kernel.org>; Fri, 15 Sep 2023 13:14:43 -0700 (PDT) Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-68fc9e0e22eso2124885b3a.1 for <linux-kernel@vger.kernel.org>; Fri, 15 Sep 2023 13:14:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1694808883; x=1695413683; 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=qkNg/tr3QrWcASJiKwsE4eOsWfikvegDZMItdS4GDes=; b=dIQOpXFoq7qZUoDMH78/jDAu7QDLIHf9v1h6hsKjkbz++dZ0k9P4oD5/vgxC1n3nVT wr8oXmowHzs4IUtHkHa5KEPIS1vcVsfMDu6dn0pQmENHED2eF8rTHpTZl1ymO7V0/j7Z orTAjy3qNvmbSbm06uR5uoseLw4HWbVpmuPb0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694808883; x=1695413683; 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=qkNg/tr3QrWcASJiKwsE4eOsWfikvegDZMItdS4GDes=; b=p6zlJq5bvVuJdFYWPM962u4LyRwimiBq0/rjUxqNExSi/bn53tPd7xxD3FPSYF6Z/c LLcME5b2hZRXxaAwHthfmpeU32K+PcSBNjW3iKWxVPW2lU2540WoG6LUclzSNyRfy0eo z3YVsSTcXUnxtf2UElOhV1frRIjDCsRAfEX9b1h7tM1pfatV5A0BRoo2rMMKcNrkZmT6 G51SbVFSW7u/3e8p+Iogh/PWCNP6l1IbeNYS+iplkDZT0L+T4akpT7NHK6awo02sKXDs eGJNFICBD9LJA+E4aV0zS1441XpCubbcBsfwLqA7C1yXZ6UykQ1gN4/N5kSFRJh+TqjF oYvA== X-Gm-Message-State: AOJu0Yx/ZIUs3h7dJggCoSJ4jTwZZctkCTXmnL8EFKHNFGqjegkNSXl+ 5WpNop4/SQVRKSbW2Ms/59itHQ== X-Received: by 2002:a05:6a00:851:b0:690:42d5:4332 with SMTP id q17-20020a056a00085100b0069042d54332mr3152371pfk.6.1694808883096; Fri, 15 Sep 2023 13:14:43 -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 j16-20020aa79290000000b0068c90e1ec84sm3339012pfa.167.2023.09.15.13.14.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 13:14:42 -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>, 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] NFS/flexfiles: Annotate struct nfs4_ff_layout_segment with __counted_by Date: Fri, 15 Sep 2023 13:14:39 -0700 Message-Id: <20230915201434.never.346-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1294; i=keescook@chromium.org; h=from:subject:message-id; bh=ulAteUUegKxPPNYcaO1yT0Twc5GfPCHdyqd9WNVKmuo=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlBLsvlYHxhP8rtZTlzFEmT5U4B5FDD5sjM+zNr VMPn0lzxlKJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQS7LwAKCRCJcvTf3G3A JmiKD/4okdWMQlAOtNFwJ5mpfcjcBIwyOr+dV6DW3brxCulz1Sx4uB9/LXER2a9gfv2tvVAyMTN XDHT5U46yT61zFXmmVQf/Q9Nehs9mPTBDRUtUKKyXbWpS22DzSZk7/SryP81AV8cUxtmHjeEMQ8 SIIQWiIXzvgA8rHMvY55qzEpxrmQx/6ohJ+0kHCBHeXs9EShu05fPwnSBsnIBHZr75zsBnwmOm8 13zVz+dn1HrkVfnCsslNOCgU8cn5bVggkWqCay62gJOsZYDmxSJnm1dFKZWbG6FTxKb7snRjksj lHjd5yQIavBmZ40R9L1Lk0AidCSNvx+gsnNWBBtKSl2MgbUaEtBG/MtCprtSz66r0GOsdbpq6lQ m7O8dnOtI1Dl7WesCrgz71xVvQNjsfdRARa8OYvPAI6oEs+lzIKgA6M+gOkLtgSupQF0+NrakmA hPHiFJ2PB5Svo/IJLQeDi3ORyPTvLwKditTekz3tO6GvCAS49b6iZQzdsYtiFZXwKR/UUPCVFLZ /DTJbTPdOig5sA4lEhna5M0qUCZMrnWrPg4lxywbU8dzKDw0xnz2Pqpgq+e2JzjuA91/l79teeM EHTB/zq59KZrmd4W+bfACwlCKDRRRfg4kpqnimfoBZIL7lm5T6G1yQa5tdjYyHJVsJfsxLVreHY LP1DxLZ uPAY/z3g== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Content-Transfer-Encoding: 8bit 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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email 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 (lipwig.vger.email [0.0.0.0]); Fri, 15 Sep 2023 13:16:32 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777139273535405742 X-GMAIL-MSGID: 1777143319837637677 |
Series |
NFS/flexfiles: Annotate struct nfs4_ff_layout_segment 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_ff_layout_segment.
[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: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
fs/nfs/flexfilelayout/flexfilelayout.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On Fri, 15 Sep 2023 13:14:39 -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_ff_layout_segment. > > [...] Applied to for-next/hardening, thanks! [1/1] NFS/flexfiles: Annotate struct nfs4_ff_layout_segment with __counted_by https://git.kernel.org/kees/c/f8ead26ffdee Take care,
diff --git a/fs/nfs/flexfilelayout/flexfilelayout.h b/fs/nfs/flexfilelayout/flexfilelayout.h index 354a031c69b1..f84b3fb0dddd 100644 --- a/fs/nfs/flexfilelayout/flexfilelayout.h +++ b/fs/nfs/flexfilelayout/flexfilelayout.h @@ -99,7 +99,7 @@ struct nfs4_ff_layout_segment { u64 stripe_unit; u32 flags; u32 mirror_array_cnt; - struct nfs4_ff_layout_mirror *mirror_array[]; + struct nfs4_ff_layout_mirror *mirror_array[] __counted_by(mirror_array_cnt); }; struct nfs4_flexfile_layout {