From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (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 A88E634C983 for ; Wed, 5 Nov 2025 20:20:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762374006; cv=none; b=lv1L6CXdtWFPC2122sXtLh1XEd2UJZGr+N3IROESlvKfLEN2CYfnMghgxSsJlUlYutlVuoqTsFROpfWrVDFcMFGByFUK4r/sfBQPKSPKxYrG5JpuY/nah5yUmbU/FRtemiif1wEhoIVuqqoacK4FQS/EpP+jTHQGp48EJD9ss70= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762374006; c=relaxed/simple; bh=NFjiFGdeD6gzgMLbIdVyGosLHeh66otTeg/5tHoWKiw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SZMcNEERzq+VD+w/O83tAZm65jJTlSPBPRJjHwMvbidc/u/caWEa9GzbHbLmoe6l5MT8YO/iuSRlThk9KU7C0mdxxCAFWxEARIJ8/OtAQyI4+59YOGPaLNsCaBRGlVO3POPPBOd8uUTKOQjeou9yHavTjgkBSYrMOKcr/+fW9KU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=cloudflare.com; spf=pass smtp.mailfrom=cloudflare.com; dkim=pass (2048-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b=bhT4TAQj; arc=none smtp.client-ip=209.85.218.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=cloudflare.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cloudflare.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b="bhT4TAQj" Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-b72134a5125so40117766b.0 for ; Wed, 05 Nov 2025 12:20:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1762374003; x=1762978803; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=JutpWbdG9YYVnRwTeE3UQ1dwhCFVxmeYmgKPLzbCKA4=; b=bhT4TAQj8GQjNoAZFuQDUAPlEeU/UDlGXiQh3mSkLOaWQGmSUKNoN1JX9nnXuspnCi L605nGdsRocoA8+dkE6dJJTOOiEU1UBtEIFMGmia9aGWthpyQ0mIYT/23Y+PsfA1k+sj rdSB7k8XkBsSvdaVr52snlForNVigGae1908WljZpAmraEUFsyg0zjZ7I7AqVRArmYvL XI8qUzcL6Sx63pHm7m1WDO/qE5KNUPrN/9j4MgguKSWYlwyD4DAxH77ACRIWUGp3psA3 5pHYjdnMm3tpwJ6EJZNciUV9zVwCF44xrMEYLHkvGaXHQD5U+aXojG75NBO0XawZSGvc lcjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762374003; x=1762978803; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JutpWbdG9YYVnRwTeE3UQ1dwhCFVxmeYmgKPLzbCKA4=; b=QqorKArBWY5VrooCs3nmWI24DZmTLOYHcikkH4HrwpLmnhgeLbzrKiDbtFMpJOSZqq 1ZXPBxD61Gg4pD0FMN5q1/EicTag3vggIUb+cs4Za0hbJgB2Uk7VUQvKc17sHpJsJC8J Ihq75J3ph1oO5D6Idm7tT3b2Yh03/wWE/E2t8D8zoNIUMeUnu4Cd3a59zk2h9dKR+jAk qeMtQwYV5YKq/J4Hu9rASobZLs72IXOmyHjoYO3z9jzT8qcNeSH5lI4UTQSi8c8j7RMi lWU6yMSj5MCGRdYNfkfQ2rtpNOEonXozBu6dbEB9Bqbu5+YiixakGOvfTLBcLRFU3wGY TaBA== X-Forwarded-Encrypted: i=1; AJvYcCXBgMPhlViXqtKyLws91JkofBv0DyQKEZcmaUo/Ml6S+ixz/+l3DUq9IfSWfbXrrcU0j7MXp7w=@vger.kernel.org X-Gm-Message-State: AOJu0Yyi4d50gAofeD3RCxIpFR+Go6hVATCv0xDkOTm6/dVYWbgw7sPN TPzZe6qkjmwIdYZCVxW9jT+9qYvLP6tnZ50/hBt8iK93ABEnV0K80TIaETi9Gzjl2UE= X-Gm-Gg: ASbGncsyz+7uTnwy6an1fsx6apJeW3m8GhbHZLs3fBW8FfQjSsJnLkVbOYTGaL7jFbI sqmtC6u/mkDJrBE1T8dbTGNDYJIjTfw2Ip40w4qDAQBmb5UCjRND+KEyPycLg9WzS5AoW5s4rWg fZjb/9ZRj+gXXyrbAj5ra/dWdMzKq97uw1Fwi6h2Ni680Ws23gP8Iy30mDaDmt1WiuxIpKebF1l qyGfqkEAXyVXMqXYhnEdEQCEu8VMqkNb96SrfBfqDIUHfiCJXeoR/ahowlnYrVFEhSyT8R4yGdN ucodaaT2ax7GGeA1J6EeU+br7GBIlBe3q4Fub6oTiU2gJCbO90uBSdJCn4dFOa6xKwzWSlYa+gL 1VVaBtRUK972dbxWIbMTt1dbPNlx4oy2BBrFNzf+2xAG6XPTfnQRTyz36s99o2PeVPIF0/OVbrz 0j0Xr4cfmM8G3lXZFF/AA50WGNIX+9Fw+rlHbF5LQZRiSyi4nQ5KMj5MZg X-Google-Smtp-Source: AGHT+IHFMoXQdNn0rpkh1brEWR+6TkVE/T1PalnlWvIK7M+5tiw5C4YVqbHrcCKAwjMcqk90jxUdDA== X-Received: by 2002:a17:907:d64a:b0:b72:5380:f655 with SMTP id a640c23a62f3a-b72654c23efmr411812166b.34.1762374002875; Wed, 05 Nov 2025 12:20:02 -0800 (PST) Received: from cloudflare.com (79.184.211.13.ipv4.supernova.orange.pl. [79.184.211.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b728937cc82sm45049466b.21.2025.11.05.12.20.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Nov 2025 12:20:02 -0800 (PST) From: Jakub Sitnicki Date: Wed, 05 Nov 2025 21:19:46 +0100 Subject: [PATCH bpf-next v4 09/16] bpf: Make bpf_skb_change_head helper metadata-safe Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251105-skb-meta-rx-path-v4-9-5ceb08a9b37b@cloudflare.com> References: <20251105-skb-meta-rx-path-v4-0-5ceb08a9b37b@cloudflare.com> In-Reply-To: <20251105-skb-meta-rx-path-v4-0-5ceb08a9b37b@cloudflare.com> To: bpf@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Martin KaFai Lau , Daniel Borkmann , John Fastabend , Stanislav Fomichev , Alexei Starovoitov , Andrii Nakryiko , Eduard Zingerman , Song Liu , Yonghong Song , KP Singh , Hao Luo , Jiri Olsa , Arthur Fabre , Jesper Dangaard Brouer , netdev@vger.kernel.org, kernel-team@cloudflare.com X-Mailer: b4 0.15-dev-07fe9 Although bpf_skb_change_head() doesn't move packet data after skb_push(), skb metadata still needs to be relocated. Use the dedicated helper to handle it. Signed-off-by: Jakub Sitnicki --- net/core/filter.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/core/filter.c b/net/core/filter.c index 9d157d71277e..69c4e8fb402e 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -3882,6 +3882,7 @@ static const struct bpf_func_proto sk_skb_change_tail_proto = { static inline int __bpf_skb_change_head(struct sk_buff *skb, u32 head_room, u64 flags) { + const u8 meta_len = skb_metadata_len(skb); u32 max_len = BPF_SKB_MAX_LEN; u32 new_len = skb->len + head_room; int ret; @@ -3891,7 +3892,7 @@ static inline int __bpf_skb_change_head(struct sk_buff *skb, u32 head_room, new_len < skb->len)) return -EINVAL; - ret = skb_cow(skb, head_room); + ret = skb_cow(skb, meta_len + head_room); if (likely(!ret)) { /* Idea for this helper is that we currently only * allow to expand on mac header. This means that @@ -3903,6 +3904,7 @@ static inline int __bpf_skb_change_head(struct sk_buff *skb, u32 head_room, * for redirection into L2 device. */ __skb_push(skb, head_room); + skb_postpush_data_move(skb, head_room, 0); memset(skb->data, 0, head_room); skb_reset_mac_header(skb); skb_reset_mac_len(skb); -- 2.43.0