Received-SPF: pass (google.com: domain of linux-kernel+bounces-165322-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Wed, 1 May 2024 15:35:57 +0200
From: Erick Archer <erick.archer@outlook.com>
To: Kees Cook <keescook@chromium.org>
Cc: Erick Archer <erick.archer@outlook.com>,
	Marek Lindner <mareklindner@neomailbox.ch>,
	Simon Wunderlich <sw@simonwunderlich.de>,
	Antonio Quartulli <a@unstable.cc>,
	Sven Eckelmann <sven@narfation.org>,
	"David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
	Nathan Chancellor <nathan@kernel.org>,
	Nick Desaulniers <ndesaulniers@google.com>,
	Bill Wendling <morbo@google.com>,
	Justin Stitt <justinstitt@google.com>,
	"Gustavo A. R. Silva" <gustavoars@kernel.org>,
	b.a.t.m.a.n@lists.open-mesh.org, linux-kernel@vger.kernel.org,
	netdev@vger.kernel.org, linux-hardening@vger.kernel.org,
	llvm@lists.linux.dev
Subject: Re: [PATCH v2] batman-adv: Add flex array to struct
 batadv_tvlv_tt_data
Message-ID:
 <AS8PR02MB7237099D421106BC1EF10BDB8B192@AS8PR02MB7237.eurprd02.prod.outlook.com>
References: <AS8PR02MB723756E3D1366C4E8FCD14BF8B162@AS8PR02MB7237.eurprd02.prod.outlook.com>
 <202404291030.F760C26@keescook>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <202404291030.F760C26@keescook>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: AS8PR02MB7237:EE_|AS8PR02MB9910:EE_
X-MS-Office365-Filtering-Correlation-Id: e15d07d5-bc9f-490a-9573-08dc69e3a8c7
X-Microsoft-Antispam:
	BCL:0;ARA:14566002|461199019|3412199016|440099019|1710799017;
X-Microsoft-Antispam-Message-Info:
	PhU/VvkXDVhJbTyK6Hf88iSS5N4f6+AM4DlrMNVg/3NiwCF/5dSeuXk8xUzqQZd94PHsiMwn9IBGSqpGNz4qGhxteW0NADy/jH72LTaVaLXlEPZHrCWtpFHuewLGpCmrec0R2xFZr43cizvd/BCcBfkMmATqWzfofhz8uKkGl1B5zTlqOmmqP9Vs2iUOsFQIjCS5PataqEY8qMWgnasYivxp3z2bQNmdQ5tjELeOZBeZ7xYwtmbWl5utDhVTj/qdd0JYjbhmxdO9yWYlIjsjJ2GPomDIK9/qslURQcj9a3pXJJSlLScFexiWcGod16LoCVw+b3V6ZfKzyYyYKY2oiqR9Pe9SADIJaDSln4SO00QRsPL9X4hXx86EXqy2PAMZInP+cgJpqSEygj9BePt7+Ya/KI9U3oRnJbGq7yFkz4uti18Y7dDR4qlcW6U+yXhJr3CU7TRbL6hz5DxIvGB8Qx48wohfhHHnfaLK60CycWI/watLxFc2odz3khMLP7N7hUhw8iSvd39LDPLEx6g+NqAn9/RBBwuQMNF6bMj616dQMQ4/+tBlxP9E6/NJ96w58x5NwE0Ka6SRbYNFN+fe66bvRTNqRRkolkahN6InjHhwCb2zXYi3KZK0PdxQW0Ql
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?pAvegvZ/7pFCq0DVaCMpi79yK13krMJKxl8RlXEAH+Pr0KlukygmlgNVtwH6?=
 =?us-ascii?Q?VkolgkTxF/T/hXpxq1ilXBFVNQHPyMkm7q9gd4RS7B26cTovj6ifj7Do6JQ3?=
 =?us-ascii?Q?mhm0mZ6BHk+Fq1J4hyPr/aWbasmlX4Rjlkq1SZYAetXmM0CYclIib51BmLhi?=
 =?us-ascii?Q?OBlDxzcb/6GlVnFkuDmfJFvh3c4tlMG3NhErADQRWWXmCORGokpeWlpn3uiv?=
 =?us-ascii?Q?VQNvuyOXic05rxO/4jp3U5wHD/Edu8eLtX/lgDYd93CHsoB7rz1yUKSROoVr?=
 =?us-ascii?Q?8vZ9DxtVEszK/dXViqvxRDa3V1h/URmTnlRYpZJyI7jxmk8Unskzj7ccqGAg?=
 =?us-ascii?Q?nqSofZCe1XiSnCkvaACjIaxQFJjJAeEl8x86n3VnOUBcJVkKnl/NPq1MzXNi?=
 =?us-ascii?Q?aLVEIbqu1qlWGZsfxdDaCS2SRHyvIrK+me7X3vLYeoix52W30X1xMRk861Cy?=
 =?us-ascii?Q?+JWMd/bemrHY/hMlN9f7raeTqcCvZZzK0HS7Ydqye2NF2VEihDXlWflVEfqy?=
 =?us-ascii?Q?AzvPPH6gvJ6oQ7/i0NxS1YhQfmx7BRtZaIsTmcuExRpr+CMM8wIjQ/iG7ea3?=
 =?us-ascii?Q?58IT14nlFo5SIK+oE9RSk7BlMYj2tPXmp521TZGWxVHfvm7wcQ0Xjn7q+lTu?=
 =?us-ascii?Q?di1aN2PKdYauLOX9mVTtyKuFK02SIw6dd9fpVx4DJIxCt3sltjNKSsukeO7l?=
 =?us-ascii?Q?Qi760uqMNmtYMxL9Am+zuYT7FOcbW5kA1e6QTHc5hRP1nf8R8FMJsatu1zdG?=
 =?us-ascii?Q?YOqMyUUXo6HQLz87HnoBgItm7+8Ahx9c0d1bPPD7dJkVOMyWhl0B/gRJw9k7?=
 =?us-ascii?Q?u1Be6pBbB0H0le0Yija3IWvpVFlH071Ph9isg+VwmBPN3QKdJby0Exnyfsbq?=
 =?us-ascii?Q?6/WZe6H4drBzoCS/MkGxNRTFMcmBHaATylTRbUifCFRQXwI/U/qKedAqhCgO?=
 =?us-ascii?Q?NLeFaIEcRgwJsLRqyBMgtA/sOIgW2usjTYwz1uqN7uTQ27a/OX+1CHGVDQ1n?=
 =?us-ascii?Q?rLyQ36j6o5U6ta4eZ9Ae7qVG27gw05OG7xe7d86oH9D01fzD3S9kCzDWe9Ev?=
 =?us-ascii?Q?wMlgdi0X9KaqW0URKBIzGNeXhNAdSIthur23/P15s5CQPMLeBHjxprzfY56r?=
 =?us-ascii?Q?gnbAxDp2XWJw4hsbdx3ey+KuVRm9N8VFAPw/jjTL2nLWTwVz+JLdVlYpIaGh?=
 =?us-ascii?Q?1Be5OhvBpaX3mck4oofQxCFGHC+V9Ll94H81bXq6hj/H7ptIxQDzixOwHhQ3?=
 =?us-ascii?Q?LhfeyHrrM4mK55B8MIJP?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e15d07d5-bc9f-490a-9573-08dc69e3a8c7
X-MS-Exchange-CrossTenant-AuthSource: AS8PR02MB7237.eurprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 May 2024 13:36:09.2875
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg:
	00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR02MB9910

Hi Kees,

On Mon, Apr 29, 2024 at 10:36:23AM -0700, Kees Cook wrote:
> On Fri, Apr 26, 2024 at 07:22:47PM +0200, Erick Archer wrote:
> >  
> > @@ -3957,17 +3947,18 @@ static void batadv_tt_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
> >  
> >  	num_vlan = ntohs(tt_data->num_vlan);
> >  
> > -	if (tvlv_value_len < sizeof(*tt_vlan) * num_vlan)
> > +	flex_size = flex_array_size(tt_data, vlan_data, num_vlan);
> > +	if (tvlv_value_len < flex_size)
> >  		return;
> >  
> > -	tt_vlan = (struct batadv_tvlv_tt_vlan_data *)(tt_data + 1);
> > -	tt_change = (struct batadv_tvlv_tt_change *)(tt_vlan + num_vlan);
> > -	tvlv_value_len -= sizeof(*tt_vlan) * num_vlan;
> > +	tt_change = (struct batadv_tvlv_tt_change *)(tt_data->vlan_data +
> > +						     num_vlan);
> 
> This is the only part I'm a little worried about. The math all checks
> out, but the compiler may get bothered about performing a pointer
> calculation using the vlan_data flexible array memory. As in, this may
> be calculated as an array offset, since it is the same as:
> 
> 	&tt_data->vlan_data[num_vlan]
> 
> Which, for big endian where __counted_by is in effect, the bounds
> checker may throw a fit since we're going past the end of the array. In
> other "multiple trailing flexible array" situations, we've done the
> addressing from the base pointer, since the compiler either knows the
> full allocation size or it knows nothing about it (this case, since it
> came from a "void *" function argument). I would suggest:
> 
> tt_change = (struct batadv_tvlv_tt_change *)((void *)tt_data + flex_size);
> 
First of all thanks for the review and the great explanation. The change
looks reasonable to me. I will send a new version with this suggestion.

Regards,
Erick