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 983E1CE7A89 for ; Sat, 23 Sep 2023 12:22:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231791AbjIWMWf (ORCPT ); Sat, 23 Sep 2023 08:22:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231834AbjIWMWW (ORCPT ); Sat, 23 Sep 2023 08:22:22 -0400 Received: from omta40.uswest2.a.cloudfilter.net (omta40.uswest2.a.cloudfilter.net [35.89.44.39]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CECFC10EA; Sat, 23 Sep 2023 05:21:34 -0700 (PDT) Received: from eig-obgw-5007a.ext.cloudfilter.net ([10.0.29.141]) by cmsmtp with ESMTP id jx8dqJ7iHbK1Vk1deql6uR; Sat, 23 Sep 2023 12:21:34 +0000 Received: from gator4166.hostgator.com ([108.167.133.22]) by cmsmtp with ESMTPS id k1ddq0InVJUhvk1ddq1JjQ; Sat, 23 Sep 2023 12:21:33 +0000 X-Authority-Analysis: v=2.4 cv=Re6Dtnhv c=1 sm=1 tr=0 ts=650ed84d a=1YbLdUo/zbTtOZ3uB5T3HA==:117 a=P7XfKmiOJ4/qXqHZrN7ymg==: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=JfrnYn6hAAAA:8 a=drOt6m5kAAAA:8 a=VwQbUJbxAAAA:8 a=07d9gI8wAAAA:8 a=cm27Pg_UAAAA:8 a=3OtJ-fU1epfT2BxG-t4A:9 a=QEXdDO2ut3YA:10 a=1CNFftbPRP8L7MoqJWF3:22 a=RMMjzBEyIzXRtoq5n5K6:22 a=AjGcO6oz07-iQ99wixmX:22 a=e2CUPOnPG4QKp8I52DXD: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=tknbAJbR0XiQqwpm/Xnoi1IoVHkEPm12JuyW0RHfomM=; b=llaO0aIx9SU2vfQ0N2IGjTWr/C lliL6aOFTr27O9f+ElRE8e3gZOc5Aotu6z1SiJ6nY5sYDIG7IVsPiTTRuGjPHc+ssXb/xyOPrM5Hf v8Alxeae8gYpE9muJBSd0VAvf9BFrpXOMdO7lm2aan4NdmoNhj42D7mjM3nMi4fK/fOEsaYJnSIjs StAPfvl8z66zQszNeVQS6JHzXGN2iLqP/bJ+34KqX4tkNhCqs3H+p0mCtJa6JdP92DLF2bPkJTqyi efWtrzmtB8GH4/sRjdODVG4gGQ02DX3aUaQEvCh7pIaZxTprv9GyLBkD06nyB/fAuI6McyQZVWObV xdPIh7ww==; Received: from [94.239.20.48] (port=49354 helo=[192.168.1.98]) by gator4166.hostgator.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.96) (envelope-from ) id 1qjy8Q-003i3a-2g; Sat, 23 Sep 2023 03:37:07 -0500 Message-ID: <04d51691-4f58-f126-0f32-9ed398182b40@embeddedor.com> Date: Sat, 23 Sep 2023 10:38:11 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: Re: [PATCH] watch_queue: Annotate struct watch_filter with __counted_by Content-Language: en-US To: Kees Cook , David Howells Cc: Randy Dunlap , Al Viro , Christian Brauner , Jonathan Corbet , Siddh Raman Pant , Mauro Carvalho Chehab , Qian Cai , Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org References: <20230922175407.work.754-kees@kernel.org> From: "Gustavo A. R. Silva" In-Reply-To: <20230922175407.work.754-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: 94.239.20.48 X-Source-L: No X-Exim-ID: 1qjy8Q-003i3a-2g X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: ([192.168.1.98]) [94.239.20.48]:49354 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 0 X-Org: HG=hgshared;ORG=hostgator; X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfBTk97PZnvOCc1H4A7lcDpWuzwUJQXQmqmpsnsWK7motD09L+CY0I8f6TyeO1ZDt3WK6hmZVT/8SqS3wnxbwk/N02B05jUA+Z0KlTUpgGM6hvK6eVSOn 5j0PJBZEAlnKtYhXmWbWdkizu02K8X7i5MbsZ53Oc1X93ZdWFPmrn6ePnx/46FPexiy/ANb+7n+gh85VSPFa32ZoKRgbQpD9ukLlDzMx3VrVCq416c2g6aFE 0qhqvj9Z88gBpjJe30oWmRQUgPug8vv3iraCqrsv96I= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 9/22/23 11:54, 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 watch_filter. > > [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci > > Cc: David Howells > Cc: Randy Dunlap > Cc: Al Viro > Cc: Christian Brauner > Cc: Jonathan Corbet > Cc: Siddh Raman Pant > Cc: Mauro Carvalho Chehab > Cc: Qian Cai > Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva Thanks -- Gustavo > --- > include/linux/watch_queue.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/linux/watch_queue.h b/include/linux/watch_queue.h > index 45cd42f55d49..429c7b6afead 100644 > --- a/include/linux/watch_queue.h > +++ b/include/linux/watch_queue.h > @@ -32,7 +32,7 @@ struct watch_filter { > DECLARE_BITMAP(type_filter, WATCH_TYPE__NR); > }; > u32 nr_filters; /* Number of filters */ > - struct watch_type_filter filters[]; > + struct watch_type_filter filters[] __counted_by(nr_filters); > }; > > struct watch_queue {