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 A1FBECD37AE for ; Fri, 15 Sep 2023 20:51:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237696AbjIOUvh (ORCPT ); Fri, 15 Sep 2023 16:51:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237797AbjIOUvU (ORCPT ); Fri, 15 Sep 2023 16:51:20 -0400 Received: from omta036.useast.a.cloudfilter.net (omta036.useast.a.cloudfilter.net [44.202.169.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6BB76468C for ; Fri, 15 Sep 2023 13:50:36 -0700 (PDT) Received: from eig-obgw-6003a.ext.cloudfilter.net ([10.0.30.151]) by cmsmtp with ESMTP id hFjkq1OAUDKaKhFlsqIewH; Fri, 15 Sep 2023 20:50:36 +0000 Received: from gator4166.hostgator.com ([108.167.133.22]) by cmsmtp with ESMTPS id hFlrq6JgQlWQAhFlrqzWZT; Fri, 15 Sep 2023 20:50:35 +0000 X-Authority-Analysis: v=2.4 cv=INMRtyjG c=1 sm=1 tr=0 ts=6504c39b 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=pGLkceISAAAA:8 a=20KFwNOVAAAA:8 a=VwQbUJbxAAAA:8 a=cm27Pg_UAAAA:8 a=HvF037n1xESchLcPDVoA: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=bGxhVUtgvEtIdv5fdJaFlvXT8/mXEEnYVeDX80O0mX8=; b=pVxo90MtuiavN6bEoVO6DwiSj9 X7B/rqqGQsao/orbkh4UlEIIVyIl98hLd2mWBwQaUK9Z1mbR2G37nYMFvWZL3F71qEv7OY+oXglG5 rA+J0kWnfqnIdkAItqbXTEPpBsqGmHPP5Jc8M77613D98okLcnMdKj9srH8sRAqY+w0eCAG/wwCqK zzFKVAe6wXu3WOabWWzdEVeTMvajCqeObw3OY84OAOeHiDP42lWwDkFvOadx5Msp39voUnAbjSrLe sX3emfdNDgH5fvEh52X9LkYtobJrqPOUnOge6pDGCUEteStwQgtX0V0q8LqC5G2yfWSjXHW6ixTQ3 My8YkabQ==; Received: from 187-162-21-192.static.axtel.net ([187.162.21.192]:54838 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 1qhFlq-002fvY-1O; Fri, 15 Sep 2023 15:50:34 -0500 Message-ID: <631103a7-6119-145d-8230-5a97e1362785@embeddedor.com> Date: Fri, 15 Sep 2023 14:51:30 -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] ceph: Annotate struct ceph_osd_request with __counted_by Content-Language: en-US To: Kees Cook , Ilya Dryomov Cc: Xiubo Li , Jeff Layton , ceph-devel@vger.kernel.org, Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org References: <20230915201517.never.373-kees@kernel.org> From: "Gustavo A. R. Silva" In-Reply-To: <20230915201517.never.373-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: 1qhFlq-002fvY-1O 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]:54838 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 482 X-Org: HG=hgshared;ORG=hostgator; X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfGwo8CfbDl2XOpZcExJy4z8NvJi7UQphj4WnmxSnME1msHIWGxzVjW7U7IGqVMs47NgyadzbsdEMdu3h+/7zu8G1+ka+aGSLqxQ66uFP+xOJd8bwS89U bNOU144Nr1h8yZ2zNXbrjKdE1eQYDS7pxAHmELgWn+3ayjFyd+LH/rSgCr8LRzVAZAIBGWC+nppi/R+is9ck4i4GkubJp5JYvfSa6cYF7ogOVE308g5lPPv7 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 9/15/23 14:15, 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 ceph_osd_request. > > [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci > > Cc: Ilya Dryomov > Cc: Xiubo Li > Cc: Jeff Layton > Cc: ceph-devel@vger.kernel.org > Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva Thanks -- Gustavo > --- > include/linux/ceph/osd_client.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h > index bf9823956758..b8610e9d2471 100644 > --- a/include/linux/ceph/osd_client.h > +++ b/include/linux/ceph/osd_client.h > @@ -278,7 +278,7 @@ struct ceph_osd_request { > int r_attempts; > u32 r_map_dne_bound; > > - struct ceph_osd_req_op r_ops[]; > + struct ceph_osd_req_op r_ops[] __counted_by(r_num_ops); > }; > > struct ceph_request_redirect {