From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB5BECD37A9 for ; Fri, 15 Sep 2023 20:31:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236753AbjIOUbN (ORCPT ); Fri, 15 Sep 2023 16:31:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236626AbjIOUa5 (ORCPT ); Fri, 15 Sep 2023 16:30:57 -0400 Received: from omta38.uswest2.a.cloudfilter.net (omta38.uswest2.a.cloudfilter.net [35.89.44.37]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 523A2106 for ; Fri, 15 Sep 2023 13:30:52 -0700 (PDT) Received: from eig-obgw-6002a.ext.cloudfilter.net ([10.0.30.222]) by cmsmtp with ESMTP id hF0XqlPijQFHRhFSmqvQfn; Fri, 15 Sep 2023 20:30:52 +0000 Received: from gator4166.hostgator.com ([108.167.133.22]) by cmsmtp with ESMTPS id hFSlqwvPmZRGzhFSlqOJ7e; Fri, 15 Sep 2023 20:30:51 +0000 X-Authority-Analysis: v=2.4 cv=PLscRNmC c=1 sm=1 tr=0 ts=6504befb a=1YbLdUo/zbTtOZ3uB5T3HA==:117 a=WzbPXH4gqzPVN0x6HrNMNA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10 a=zNV7Rl7Rt7sA:10 a=wYkD_t78qR0A:10 a=NEAV23lmAAAA:8 a=20KFwNOVAAAA:8 a=VwQbUJbxAAAA:8 a=cm27Pg_UAAAA:8 a=1rGUjaHSoLxGkM6IGjIA:9 a=QEXdDO2ut3YA:10 a=AjGcO6oz07-iQ99wixmX:22 a=xmb-EsYY8bH0VWELuYED:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=embeddedor.com; s=default; h=Content-Transfer-Encoding:Content-Type: In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date:Message-ID:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=kqpFc+6WUDnssAblCEJx9AOlPnNTHAR7+vmbVqfjYCw=; b=A2cpeTa8LyHMnqW5epBJVnKoth Gp+/9Lk7FQ8D4FVKxWi19O6M0d540ICzsDM6YBsqCbUCi7s20XnaGCi+/D/+JibzAtaovUMhmnZcd y9gRyf1xEK+AUUL6SV2MGxXLXZl3ML0Vhw2saf+47hulOKzMUguUBo+6jp5BH+TgRN+T6h52kDC28 s1KQozrbTsdOZf6T55kAM5Sifb1Sc7nQZ2ezhlIW19I8CVE+UfhFDsbQifQrOSWKp9Z7XN/ptLti/ Wm7iG927k61ueZAb4IXu2rVFrAZpDAB0jN4tvLXdMu3lUy2dwyzEBqNui9V5YqFGPPKPnluo+Lgin IURVOC6A==; Received: from 187-162-21-192.static.axtel.net ([187.162.21.192]:55922 helo=[192.168.15.8]) by gator4166.hostgator.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.96) (envelope-from ) id 1qhFSk-002MlD-1G; Fri, 15 Sep 2023 15:30:50 -0500 Message-ID: <030807ff-5fc0-3461-565e-be06bf0906dd@embeddedor.com> Date: Fri, 15 Sep 2023 14:31:46 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH] dm crypt: Annotate struct crypt_config with __counted_by Content-Language: en-US To: Kees Cook , Alasdair Kergon Cc: Mike Snitzer , dm-devel@redhat.com, Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org References: <20230915200344.never.272-kees@kernel.org> From: "Gustavo A. R. Silva" In-Reply-To: <20230915200344.never.272-kees@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator4166.hostgator.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - embeddedor.com X-BWhitelist: no X-Source-IP: 187.162.21.192 X-Source-L: No X-Exim-ID: 1qhFSk-002MlD-1G X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 187-162-21-192.static.axtel.net ([192.168.15.8]) [187.162.21.192]:55922 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 87 X-Org: HG=hgshared;ORG=hostgator; X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfLGVERTe1l3LyBcXwulHa/ipXkneZjEXxCe93dYo9L81yss5YIJkuxDj+S4xN9N6WnLCXCuYil597QUmegh9rx5XDvzCvAZYhX6kXkVP+DKvM5z/8NJq vI4fFpERrtDagNrn0IEGF+KI2d4wzwoTneJhqFYDEt724N1JaKA8ShzD1qjnlNj81vySFhUAXNDOKIdIn/kjn8/iAdxWK6FaunhAUJ3YoEL2C4cexrD1vNAW Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > Cc: Mike Snitzer > Cc: dm-devel@redhat.com > Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva Thanks -- Gustavo > --- > drivers/md/dm-crypt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > 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