From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (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 93E342D94B2 for ; Sun, 26 Oct 2025 14:18:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761488326; cv=none; b=pir7bflzIdxeJyHsNpavlxjAed7lKDODDI5+5Ui84wMd/L2LI8FLpF6sGXZGZetHCyY8AcX1MCCDT3ogxAmaD0hlyQtHeWDsbLwiq2p3xSLQwd4arxNdcIH/8YSBaL5tAbaY0mFoMcAHa7zsYKOQZKKJ3rJ+ikP83kCtO7tdAno= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761488326; c=relaxed/simple; bh=1I+ZsuBg0UdnoIKEEzTbkQeFlzkeHVAGD2Ztup8Ifyg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=X0CRHcYWiSKM845eHdnaC90JtKG5dxxOUdAOoVjqSB2ndVvsg2PBMS64zxsZzwWvdd67PzlWPtBLkAv1R2cluKSD/Yq8VQGndjOIfUuft9j5ZLh/qT6l8USYRK+hRM+On3azVLWm0+EMrPTJwbGfUk4C2ZzRuacGtYrDPjaW16E= 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=LZAW6Yum; arc=none smtp.client-ip=209.85.218.49 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="LZAW6Yum" Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-b6d4e44c54aso664473166b.2 for ; Sun, 26 Oct 2025 07:18:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1761488323; x=1762093123; 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=sB4CC5zvn+S4YI0MbjpF4L6Qba6coIxIhHj/jqUzm+s=; b=LZAW6YumlqSB9wpH+qxBEGKPw/1xdPeV18jZvb1hpzhAE1igRwfVuavYi4z9cYvRoP cTH68YOxUxYoWop2WIXSJJeoq903tJBt1N3nWPQL7AOFl2HwUmQBVW9sKH6WLF8xHdxI fwjEyVn5c5k1PDtXGOcMfYDkLeyBXtwcNUU4+Z2fghyVSdvytMK9hAzVJGzpIFtbJbBh 1BcNvdw2JNZW64cwTvyVQNIz3HUXB+/vhNtafQaBTMnxeRcAGjuIKKpryH9hhC4qsu8x 19V55a++l6B//bufB/tUnUmbIl78ePhg9VB60/+rtCqrCihYGUdmvESVp9Oz9t06D0Bl 7d0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761488323; x=1762093123; 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=sB4CC5zvn+S4YI0MbjpF4L6Qba6coIxIhHj/jqUzm+s=; b=F/NAymNDj5cUE6zgDdY1lgTuwauA4hNlx+sCvI1lCwubOm66dPh662iIISBshUtOoW gESOBEjx8mwSxSNYBxGICmydPm/VuoamY/tWok9KDm4QKJfznWhYK19947LSkDJ35LHV fqlRZ8gOtIwX1Nwc11jOPczhsCJ8+EDQ8ovus0E6m/WvPoKrRidt3dVTXvFAZFmidkzM rdzkc5MxPw5d0e4E3O2qrJpod6vXjdrpQGt20miYMlWuFk/i4Gf+K46+q28HZIsoPqed s4dwoCt247DNZ4iu428Ohav85T5ee9aqVYr7olFr2m+19FATRadnEUAB/Ma1CiZxikTc yXpQ== X-Gm-Message-State: AOJu0YwEndPnBKnWjWaEtuiZFxsLltnq2Zbg5b97gOi9SdYKv9Hu7YlF qYgTnn3fplMtxigLtWtjY2TnY/3eYinogtZ4PbTrJLkryphA/wvNWvmIUR+iy38vNSk= X-Gm-Gg: ASbGnctXsVloIooKkjVSLbHKz9yRAilL4oFozJJJs01ZDqjgqh+eFAsQd6xqxY9QccS OibsBE5qqE8AdJpLmiQmvXUzHKeFgUtud4oktsU5hqBiflNQZE/A4aAF4Xpl7OLcp7Yj/O6beAm CvplcakQ+c00Mzrm82HBVf/yxGutzwstyOgVxcG0ONpeFSL624WG9Gw/lYl6ps2QXaKKuQEbC4k oknTyi30k6btXo3p92VFLVUMgBvb+Sz1FPc+0aoY/KjmsRl4/9fJRG9aYrqdPCvdokv4dMH7qfW NMgmINGmRp8xTmYGHyvHnerjKP5pmj1IUIJTt3FjWUBjpZOCHR7tj4tFGOTLPpQ9ikNM0VY8Cia elx8otf0shjxWvO8qXxxfaxNIHPYwCgdBcOlKYAo6jPyGZ8M0RXbXKeUxC1sXK6esKk+s6YT8mF O+sluff/LEZ/qnVojhMN26O0kRhFP5rYnnW1GN8gU87Hv+/72O3P5sIpaz X-Google-Smtp-Source: AGHT+IFHjCvGznHoXbRKlNIuABB8ua+WfnBq/S0K3UgEEOiI5fXfYf25nOEruhcpenxxpmu6ueKwlA== X-Received: by 2002:a17:907:3f8e:b0:b6d:7d46:52b2 with SMTP id a640c23a62f3a-b6d7d465bd3mr681142066b.15.1761488322925; Sun, 26 Oct 2025 07:18:42 -0700 (PDT) Received: from cloudflare.com (79.184.211.13.ipv4.supernova.orange.pl. [79.184.211.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b6d85413b88sm466099666b.55.2025.10.26.07.18.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Oct 2025 07:18:42 -0700 (PDT) From: Jakub Sitnicki Date: Sun, 26 Oct 2025 15:18:25 +0100 Subject: [PATCH bpf-next v3 05/16] bpf: Make bpf_skb_vlan_pop helper metadata-safe Precedence: bulk X-Mailing-List: bpf@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: <20251026-skb-meta-rx-path-v3-5-37cceebb95d3@cloudflare.com> References: <20251026-skb-meta-rx-path-v3-0-37cceebb95d3@cloudflare.com> In-Reply-To: <20251026-skb-meta-rx-path-v3-0-37cceebb95d3@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 Use the metadata-aware helper to move packet bytes after skb_pull(), ensuring metadata remains valid after calling the BPF helper. Signed-off-by: Jakub Sitnicki --- include/linux/if_vlan.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index afa5cc61a0fa..4ecc2509b0d4 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -738,9 +738,9 @@ static inline void vlan_remove_tag(struct sk_buff *skb, u16 *vlan_tci) *vlan_tci = ntohs(vhdr->h_vlan_TCI); - memmove(skb->data + VLAN_HLEN, skb->data, 2 * ETH_ALEN); vlan_set_encap_proto(skb, vhdr); __skb_pull(skb, VLAN_HLEN); + skb_postpull_data_move(skb, VLAN_HLEN, 2 * ETH_ALEN); } /** -- 2.43.0