From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f4.google.com (mail-pj2-f4.google.com [74.125.227.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4E682442130 for ; Fri, 24 Jul 2026 16:02:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.132 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784908948; cv=none; b=tp2O9LW3Bc3zfFnzBTxGYYpkcpB7rNSS76kGdJXXCSRHKCMbwFNK2XdiO9SnSuGvxxzthHdIKAYMeX4bjmy0oqN+NXnyxWHyIsUCoxnoODGYrVBlq+x7juOYC6WmNw1zLEBWDnctKbplJO22v+l9HYZO3BHmuVgc9huc+yL2RiA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784908948; c=relaxed/simple; bh=SiOlZD9NMIJEcVTScWhRNja0TOvwP7qLk8zDIbXcowE=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=nM9tIx1/Rw58ncRbLAkKy7xgqcCcMxci84lu2rJalZ7yG2YiVSXfwYyQVf1IGzFEl7hBW5G/N/yiuo3Vcj4KakR6GM730Mw+9/AXlO0y0OEf//rDP3bv3weFRSZ7AQh/sbYV/qfvnFmqMsao0ONiMt6OYRvnwE/7bvRuVgohV9M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=mVCxwjo1; arc=none smtp.client-ip=74.125.227.132 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mVCxwjo1" Received: by mail-pj2-f4.google.com with SMTP id d9443c01a7336-2cc80544c74so2205075ad.0 for ; Fri, 24 Jul 2026 09:02:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784908946; x=1785513746; darn=vger.kernel.org; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:from:to:cc:subject :date:message-id:reply-to:content-type; bh=CqElJuXGgCpnkfoHNKy8qMyBOhibQlCl5yeDj+8xAO0=; b=mVCxwjo1++wlgH8T8OWNnH4JqmNVJQQcRDUl2fWi1dCzgA531fuJsc+uv5z1wWWxTv JIKx8lrBBqn6FBYgVTe27A1vvQyDwGiIpLKIReWZssgwjB2JtMoF6gPMrk5m53YHsJuc X/0wx80ui4BtQ0/PMkvts6mLUc84EKk4ZCv7RCf3FMi2e6xWedW+R8llKPqAq2NBsayS DgKjbbtfCNgi3VcUkFCdROx17K0Q9QSXEutZGGOEhWAMXmTbV5fbeDuHnudL0uiQrja/ 1QV/XeM5BvP4gFeJAZHf/K58PvXgwiOS26UcvJF6h+i4xtKpWMAB/e7U2r/i3rFbGlCq KKNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784908946; x=1785513746; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=CqElJuXGgCpnkfoHNKy8qMyBOhibQlCl5yeDj+8xAO0=; b=kOLmNrVUHdKceYan+Mm907hKITycsRw4GToxR1e7sadDqQjr3zdUe3otSY533EDjra GXG/N4TBprt13Htl1S7+DlhLzFD4HJXndB0FLZXwi5RHc7yJPQ1hlKGJk19/RL71Vy9h FzEi1qIi0Fnm4cR0hCchbC0tUirV8/NjydQoWJBdde+yJINIl9k+nUk1m9PT0wHdlN6/ Vmz4O8Udyk/w1pNupsCX02jNGnf6uroeioRBo9xj8lE1msA3xp65Cy0V5lPwnEJgzaIE bU8wdEpaCUXC2oi6CJuyGcw69P0uyMPW0uUxTU2VCRAx36TK7BWOaVxpVfA1JOfCqoP3 5lhg== X-Forwarded-Encrypted: i=1; AHgh+RpIWy4lNTt2OORS4mpneXPNkKzW851Yx7RPUiHLl5Cd3nrVS+BXEuA/46k8Ml58nV9givhZtMSiv9RJs7w=@vger.kernel.org X-Gm-Message-State: AOJu0YwBGNPljUbz0gV1vx0071PLJiWl3DZ4cKpEubZJJSaNiBoJEUEU mgSklqtfYKgCUk8e8EKqHexRaNMxTwl3tcz38WIqRn+013YDJ9LPstZ6 X-Gm-Gg: AR+sD11h5fAJk/bqQGZhyNGGLTndnUzPWBX+BVYh7grYuOvFXJXxQsC28Qus1s/gxPu P9fvoS/3Pa1qVXc7FQ9HrNtfk0j5JwcZSVbkMjTeZ2h4Fr7Y08fAJJ3a0xGK2rT/AskEf8X2T0B rnn2bSoQz30hs1N0gkTf/kbwn7mrtyZjxYcPJgZQeZabKwdZ2o8yZsTZlsq3/5/eXcbLoiJ0qAR yOy9PjUfqUK+v+USMsigYV5g1IZMwTBcle72lRb8id7bgRZnxlmG7jZ3fI6n4RU495vfE0hbNud xVOdqr1pGmQyB2ZLhPoh4C3GMWxI1bDZ0Q7jibQYalDm3YVL3bkT3/10fGEkLc2tLt8lEE7rzEJ PT3Urfjjo1qiiYxIphd7YdZBi8GYrwzQ8ry55asXDGVJEwJDRlPe815CaXbxaaZrcFNmwch4dqc FAIV4q X-Received: by 2002:a17:90b:2787:b0:38e:9ef9:eb97 with SMTP id 98e67ed59e1d1-38ec651cb31mr7625553a91.16.1784908946308; Fri, 24 Jul 2026 09:02:26 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:5::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38f04175831sm1712388a91.11.2026.07.24.09.02.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2026 09:02:25 -0700 (PDT) Date: Fri, 24 Jul 2026 09:02:21 -0700 From: Stanislav Fomichev To: Alexander Lobakin Cc: "Cen Zhang (Microsoft)" , magnus.karlsson@intel.com, maciej.fijalkowski@intel.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, sdf@fomichev.me, horms@kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, AutonomousCodeSecurity@microsoft.com, tgopinath@linux.microsoft.com, kys@microsoft.com Subject: Re: [PATCH net v2] xsk: reject undersized tx_metadata at runtime validation Message-ID: References: <20260722041326.75199-1-blbllhy@gmail.com> <27dd39a0-71bd-4cff-8e72-6aa45df57dff@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <27dd39a0-71bd-4cff-8e72-6aa45df57dff@intel.com> On 07/24, Alexander Lobakin wrote: > From: Stanislav Fomichev > Date: Thu, 23 Jul 2026 10:15:15 -0700 > > > On 07/23, Alexander Lobakin wrote: > >> From: Stanislav Fomichev > >> Date: Wed, 22 Jul 2026 10:55:17 -0700 > >> > >>> On 07/22, Cen Zhang (Microsoft) wrote: > >>>> There is no metadata length check before accessing struct xsk_tx_metadata > >>>> fields in both xdp_umem_reg() (registration) and > >>>> xsk_buff_valid_tx_metadata() (runtime). Thus, an invalid small > >>>> tx_metadata_len (e.g. 8 bytes) passes registration and later causes an > >>>> out-of-bounds read when xsk_skb_metadata() accesses fields beyond the > >>>> declared metadata region. > >> > >> [...] > >> > >>> @@ -773,7 +773,7 @@ struct xdp_desc_ctx xp_raw_get_ctx(const struct xsk_buff_pool *pool, u64 addr) > >>> addr = __xp_raw_get_addr(pool, addr); > >>> > >>> ret.dma = __xp_raw_get_dma(pool, addr); > >>> - ret.meta = __xsk_buff_get_metadata(pool, __xp_raw_get_data(pool, addr)); > >>> + xsk_buff_read_metadata(pool, addr, &ret.meta); > >> > >> That effectively disables some micro-optimizations that were the reason > >> I created this helper -- __xp_raw_get_data() is inline, while > >> xsk_buff_read_metadata() uses the external version, probably some other > >> stuff (note the underscored __xsk_buff_get_metadata()) =\ This function > >> expanded to have no external calls on clang -O2, with this patch I'm not > >> sure it would. > > > > Any better ideas on how to solve it? I can convert all non libeth stuff > > to these new xsk_buff_read_metadata helpers and keep xp_raw_get_ctx > > to you? Will that work? > > Sure, I can take a look. > > Do you want me to pick this patch as a base or you'd like to send a new rev? I have an idea on how to keep the existing pointer (instead of introducing a copy). Let me play with it today, will send something hopefully Monday..