Message ID | 20230915200344.never.272-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 h50csp1300911vqi; Fri, 15 Sep 2023 13:26:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFgodWZAmXVTNciTKmcvULnCU3bhUVUrWH4bF/BE3ZtBcCNxLp2dBMtQlfyCPRX/r7vQrNr X-Received: by 2002:a05:6a20:430d:b0:159:d061:58e9 with SMTP id h13-20020a056a20430d00b00159d06158e9mr7943842pzk.26.1694809574727; Fri, 15 Sep 2023 13:26:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694809574; cv=none; d=google.com; s=arc-20160816; b=zGuDLkzQKio+zWV4yjNO+DFXwsnW3aipi7GEcuM3XIDF6dMihkQGF5sgU8LnuK/hoM jgiiBWlDoF/g2IHn/kS/Oeiq0u/X2dKzCuFnUg9YcEAz2b3oytE75GQfNk0ke7iR+ZEk vohHgECPFh2xf1VtviF1hTGFOG+XCMfg24Xw8fZvjTyXV9NquOZcS+6itts6Oka7jmaa hK0uGPUC1ZZ4zcVkD8c6Y891ehrCYcHXPTzcJ/vPMNZ9OAm9CjHbN1RDT9UVeP2wwbXe oH8rDp55+K/pE31ssus4HC2zsOM7F14AhYxlEtDmRuAJqDj4qAEMCjrAqLXTCgmSdnSN WD7w== 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=585ELGKH6mcU0nuyAJeZCpFUeKhNPgDgSqqVI53K3fs=; fh=8usbhTyLEs+UqinFzzonmw/C95jphrrnd4BsKDJ2VSc=; b=gq5I0+DFtErU3T8W6KVBAqDx1gW6LVwTOVD2WlnKwnpJUA4O0GM0PJiXj1Y0/+MKOS GndnFXSYye44LlZH0/Ieyi8qHIr01KBBnGN/UrkBdWGTHeUkQ5Qspy4K7iqArWwtFW8e QtA2mPa0BYUJ0kMfyN+X4ZGLJ//xLuGRM2D63WHExsArhRenB8p5HG1UopF/di2rm+Sx YKZMfHldYetk/PYhiVKxq2qMAFr+0jX7ZTpU6swgqNBI79EaS1r9hBpxjySjNLq7aZKn RRPwpEJGJqLJc6/djJHbObRyFHEW7arxvMUCwmTXhsMYxMJEpMF4ZjXyuh4QrJw71d79 eW1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="H/toPEu6"; 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 l28-20020a63701c000000b00573faa3bb52si3769057pgc.395.2023.09.15.13.26.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 13:26:14 -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="H/toPEu6"; 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 D9AA583352A4; Fri, 15 Sep 2023 13:05:02 -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 S237093AbjIOUE1 (ORCPT <rfc822;realc9580@gmail.com> + 29 others); Fri, 15 Sep 2023 16:04:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237024AbjIOUDx (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 15 Sep 2023 16:03:53 -0400 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2FE852120 for <linux-kernel@vger.kernel.org>; Fri, 15 Sep 2023 13:03:48 -0700 (PDT) Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1c4194f7635so14194225ad.0 for <linux-kernel@vger.kernel.org>; Fri, 15 Sep 2023 13:03:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1694808227; x=1695413027; 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=585ELGKH6mcU0nuyAJeZCpFUeKhNPgDgSqqVI53K3fs=; b=H/toPEu6GpGPDI/SfYB5S5T6q6DbHy789mftoN2S2PbUP3xd6W8InOwXbirIVwkF6G yCfw8xBQ7fnSb7cof0cLEL+N0EbIjlzlUsN9qAugrhwufHTp8kcdiWKqrM37Jx+ZoXPE Vhd4W6fOZd8Hkv3Wr477UVv7501cKTX9XwkjU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694808227; x=1695413027; 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=585ELGKH6mcU0nuyAJeZCpFUeKhNPgDgSqqVI53K3fs=; b=xC3rvinmzual5FRZntuFuHCZVjyUldOvhRfGKz1W0qJR1F22kMOtCJKM+NoXC7Gd4s uOwhPth6Khd8E0xvPAWuH6YcQXFwNWGauohSKNggw+Qg+QfVG00Oq4bOB5pghglh72mX EQtQfu51jfO981T6i5iDWI+b9cANPEL3nEuSoFZWXyE4B0dN9YpHVJ9Wwj1fKTDlvpNC D3MuOGsMjOc2s7xoucMR6M2B51zk8qxm6lg5BHWUEu3cfFgjvF5r8hozl9IqE0mUMa7s sbEU1lSQao5Qwy2DXwJbUz5jt2U5tRgwwq4iLrwK4a99XDcfJlZwz+KJ8mjLVRUR6MYw +xqQ== X-Gm-Message-State: AOJu0YyiwxkmMCu5tf8xKyb/oXFXLVc4NTf5gSLW+qmBuBI7nczIZR6+ hIyKsDGI+zjoRYaJwpSLSeyLdQ== X-Received: by 2002:a17:903:2311:b0:1c3:81b7:2385 with SMTP id d17-20020a170903231100b001c381b72385mr4018353plh.11.1694808227690; Fri, 15 Sep 2023 13:03:47 -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 je20-20020a170903265400b001bf044dc1a6sm3488624plb.39.2023.09.15.13.03.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 13:03:47 -0700 (PDT) From: Kees Cook <keescook@chromium.org> To: Alasdair Kergon <agk@redhat.com> Cc: Kees Cook <keescook@chromium.org>, Mike Snitzer <snitzer@kernel.org>, dm-devel@redhat.com, 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] dm crypt: Annotate struct crypt_config with __counted_by Date: Fri, 15 Sep 2023 13:03:45 -0700 Message-Id: <20230915200344.never.272-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1117; i=keescook@chromium.org; h=from:subject:message-id; bh=2J6fBiPdZIR8mGnEk0bNvAHhXLvKbIZhyM289hn91M0=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlBLihfwsK6T3HOV1j4wnd25zaVLF5WQpYGwyS+ 5kE88zkP0eJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQS4oQAKCRCJcvTf3G3A JtSpD/9zzSwBgu0DciTVR5Kuff9eIrmBXAQb1lB9CqCovFopZkSEQY5tNgaZ78xwjchx+SUL0+w U596UPQfpyHBDuBCDdrWmn59UUrEv7daZ8bnNYszDjqEEloDL9evqkm1heUI+1NZHp3hBGJMY1I EPN/1/SnJZemS9I2Ehsn50giqtGvagxkRx4RTYc43lLCi8lyzkQpyy4aWuunQZ9b/jooQ29YCRu 0qTTTLUZM2YFI0C6XmnedeWXMaxGCHs/UC/+f2Pa/lnMg3D8cahgzy1Meee+78H4cJCjFKRM8e8 WfB0QQeYwFx3HGHCcMgtArJ8KYAFzMHtm7MqCvqz8smhDz+Tt6gYqVOgFvC1LUHK9dwlsPEVjg1 mGDPElivAoJ2+o2BHgDTbzDcWqqQLoENNm2VzQWQfKmprPY/mlLkzPP8x1RWz72qpmm0qWLp/ep 1Gf+h0kU5Mxb/1lfNNO7kryPvP1ucJ42ibtEOAszDV/9sy4qkmCInNjCBni+HPeRYChSAwjwQV5 Giq8/cHs+mSSMRPvoBCFcwfHVqQY+zPw8VuhEnjXYnAGtAHiW6nz91S5ysEHuXjmdIZbWNmHbLT h55IMoKtjCzJ3T/HKqcJCJ61XbHGSK92I6vRuEyJip7zWe6rUlExh+M8SUVR6nsQ5lM9wIdus/R Dbhko43 8ezYT+5g== 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 groat.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 (groat.vger.email [0.0.0.0]); Fri, 15 Sep 2023 13:05:02 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777136644374619316 X-GMAIL-MSGID: 1777136644374619316 |
Series |
dm crypt: Annotate struct crypt_config with __counted_by
|
|
Commit Message
Kees Cook
Sept. 15, 2023, 8:03 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 crypt_config.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc: Alasdair Kergon <agk@redhat.com>
Cc: Mike Snitzer <snitzer@kernel.org>
Cc: dm-devel@redhat.com
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/md/dm-crypt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On 9/15/23 14:03, 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 crypt_config. > > [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci > > Cc: Alasdair Kergon <agk@redhat.com> > Cc: Mike Snitzer <snitzer@kernel.org> > Cc: dm-devel@redhat.com > Signed-off-by: Kees Cook <keescook@chromium.org> Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org> Thanks
On Fri, 15 Sep 2023 13:03:45 -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 crypt_config. > > [...] Applied to for-next/hardening, thanks! [1/1] dm crypt: Annotate struct crypt_config with __counted_by https://git.kernel.org/kees/c/6797f1750c3c Take care,
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index f2662c21a6df..f276e9460feb 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -224,7 +224,7 @@ struct crypt_config { struct mutex bio_alloc_lock; u8 *authenc_key; /* space for keys in authenc() format (if used) */ - u8 key[]; + u8 key[] __counted_by(key_size); }; #define MIN_IOS 64