From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from omta36.uswest2.a.cloudfilter.net (omta36.uswest2.a.cloudfilter.net [35.89.44.35]) by mail19.linbit.com (LINBIT Mail Daemon) with ESMTP id D82AD4203B2 for ; Fri, 15 Sep 2023 22:30:59 +0200 (CEST) Message-ID: Date: Fri, 15 Sep 2023 14:24:35 -0600 MIME-Version: 1.0 Content-Language: en-US To: Kees Cook , Philipp Reisner References: <20230915200316.never.707-kees@kernel.org> From: "Gustavo A. R. Silva" In-Reply-To: <20230915200316.never.707-kees@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Cc: Jens Axboe , linux-block@vger.kernel.org, Tom Rix , llvm@lists.linux.dev, Nick Desaulniers , linux-kernel@vger.kernel.org, Nathan Chancellor , linux-hardening@vger.kernel.org, Lars Ellenberg , drbd-dev@lists.linbit.com Subject: Re: [Drbd-dev] [PATCH] drbd: Annotate struct fifo_buffer with __counted_by List-Id: "*Coordination* of development, patches, contributions -- *Questions* \(even to developers\) go to drbd-user, please." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 fifo_buffer. > > [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci > > Cc: Philipp Reisner > Cc: Lars Ellenberg > Cc: "Christoph Böhmwalder" > Cc: Jens Axboe > Cc: drbd-dev@lists.linbit.com > Cc: linux-block@vger.kernel.org > Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva Thanks -- Gustavo > --- > drivers/block/drbd/drbd_int.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h > index a30a5ed811be..7eecc53fae3d 100644 > --- a/drivers/block/drbd/drbd_int.h > +++ b/drivers/block/drbd/drbd_int.h > @@ -553,7 +553,7 @@ struct fifo_buffer { > unsigned int head_index; > unsigned int size; > int total; /* sum of all values */ > - int values[]; > + int values[] __counted_by(size); > }; > extern struct fifo_buffer *fifo_alloc(unsigned int fifo_size); >