From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 78B6252CCC1; Wed, 30 Sep 2026 18:41:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790793717; cv=none; b=jBwUliBkza35PrUpCYYvml29iIj5ZGOneVcS2bVQfbCrRZUtorWo4Y4/MJ0qHd9vHSfQ7gBaz+AqNyF85jJiZqoZAFNoIA/JDuIrDSsIT87juLZ+e5X/mfLVZf4YwrFtaA14biMXtDcxebZMlDT8kTb0pxrRkG9c0iAarXB7SmM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790793717; c=relaxed/simple; bh=SjB09OYVO65BxVFMYfKPqer/P2TcrPcIdk+CkERtc5c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EjZUzDT1j/3KFeJXV+EMO6RYiRYBYjYxoQVt4ARYgJPMJVr74RCqUpexswSeuDk4mKVH5GyQvD/MOVGgEKjUF6+gVavMPvwlQAJBRhhmj8iwN+cG8z+dbdjymv+FY1OTJJi9fffXKMJ2AiRr48mT+a2uuFhv5VNvzHjgsDTkKwU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=YU5sVhnt; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="YU5sVhnt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C9EBE1F000FF; Wed, 30 Sep 2026 18:41:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790793716; bh=UA83z1iRpueJKh65QClrSLR8PzNLDqiDsUiTm9bRJRs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=YU5sVhntI8bc/L4hlgpJr8X0GB8qIYUNjz8bI1ybNpfZRe7oksXuWmPAD9qBFYM65 YAlGvaZDOQf77jtUz6sAg1itxs5UafOKEsmL5ToPgRkcsrN39JQ7Y8mG7qf/sMwRaa Zzt3p4Fis0RFC1+tnnUqqxgQUEwYS54b/BJMS/LM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, co+0ea1ac045375cf05@bugs.sh, Xiang Mei , Simon Horman , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.18 352/395] vlan: require the MAC header to be present in __vlan_insert_inner_tag() Date: Wed, 30 Sep 2026 17:30:14 +0200 Message-ID: <20260930152348.318865723@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152340.591469096@linuxfoundation.org> References: <20260930152340.591469096@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xiang Mei [ Upstream commit ab888242fce4f16f6c4d4c6ec53939ad36aa3b3a ] __vlan_insert_inner_tag() only guarantees head room via skb_cow_head(), never that mac_len bytes of MAC header are present. Its ETH_HLEN wrappers - __vlan_insert_tag() under skb_vlan_push(), and vlan_insert_tag() under validate_xmit_vlan() on the generic transmit path - therefore rewrite the first 16 bytes at skb->data: a 12-byte memmove plus two 2-byte stores at +12 and +14. No caller supplies the bound, while the pop helpers use skb_ensure_writable()/pskb_may_pull(). An IFF_TUN device has hard_header_len == 0, so packet_snd() accepts a one-byte AF_PACKET/SOCK_RAW frame. The first vlan push only sets a hwaccel tag; the next - clsact "action vlan push" or bpf_skb_vlan_push() - enters the helper with skb->len still 1. The head comes from skbuff_small_head without __GFP_ZERO, so each push drags bytes from beyond skb->tail into the frame. After three the one-byte send leaves as 13 bytes carrying 11 bytes of uninitialised slab: 0000: 5a b3 62 12 80 88 ff ff 00 b3 62 12 81 `------------------------------' only 0x5a was sent; the rest is slab, here the top 56 bits of a linear-map address Require the MAC header the helper rewrites to be present, so such a frame is dropped rather than transmitted. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Cc: stable@vger.kernel.org Reported-by: co+0ea1ac045375cf05@bugs.sh Signed-off-by: Xiang Mei Reviewed-by: Simon Horman Link: https://patch.msgid.link/20260915083152.705309-1-xmei5@asu.edu Signed-off-by: Jakub Kicinski [ adjusted context around skb_cow_head(skb, VLAN_HLEN) because the branch lacks upstream meta_len handling. ] Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- include/linux/if_vlan.h | 3 +++ 1 file changed, 3 insertions(+) --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -357,6 +357,9 @@ static inline int __vlan_insert_inner_ta { struct vlan_ethhdr *veth; + if (unlikely(!pskb_may_pull(skb, mac_len))) + return -EINVAL; + if (skb_cow_head(skb, VLAN_HLEN) < 0) return -ENOMEM;