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 83B0952CCC4 for ; Tue, 29 Sep 2026 13:51:27 +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=1790689888; cv=none; b=mPlkMU1T97YtmNaFS5v4CSJ2/HxOWQXsjny+AcC5JOb13ZCZNZciYpf3dlnI+Z4nn0FxwySBEOX1j+e3JxXD1qNV33cMXpFa9HTQHQEVdcJDP/0osftEcmMrlc11Ubv+0I0Edn5Ex6JCOmDlcUJbDCPn5OH5C8mLDv9bkc2CpRw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790689888; c=relaxed/simple; bh=E+lElYmvUs2RddIdrcg4USV7oOzFxFcQjmHvMe8QiCM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eUqgfT/2u9nRyzG4Dmxx3Mm0GsRizdv40116eg46AVJ56jieuaTpiZA3lirToZWzYSLpfOTEm+0HRIfwLAJD0Q5G/BhkUGtpiS7bEn+qBqj3ZRB+3XRCiej8flbN2x1GPbE/cNlcoYUnP5wyT/eqgkDVry85EgVlFsaauAdnMxw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jK/8yqQo; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jK/8yqQo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5140D1F000FF; Tue, 29 Sep 2026 13:51:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1790689887; bh=XXfhcSUm38NdZ9guSJNMNwLapRCkaGVb79taslzwaf8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jK/8yqQo1koRksakm3hbkzh2wV7G8BQgOpExPxq68FWsRQGlgoogqC/1f2akwPL9u Q2cXcSBQJMKSMCnzZNP0Xjto6iJQFYjPwHlm5j9a0+8ZP+EYtGlnDgOHu4d5Rmqj2j QywxgeahDsuyzRvYxU3XX60b1zd87m55nMMk1FBTrM9EK/IlVXV5hvSlSmFGWdkbCP +pWFMWkFy7E0FOmHqLg89HUueBJotlf4CsZe563Z5soK+A6u7OGTAS9wRVvw1SMQpr TKN7IDepYpqCTxCfh/y9jbuYYjRaHQvDVzs4JpY1HnW3FenjtUCpVivu0uQ2bPwYG9 TFlXCFJ6B7mKQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Xiang Mei , co+0ea1ac045375cf05@bugs.sh, Simon Horman , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1.y] vlan: require the MAC header to be present in __vlan_insert_inner_tag() Date: Tue, 29 Sep 2026 09:51:24 -0400 Message-ID: <20260929135124.3518772-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026092954-reappoint-enquirer-7872@gregkh> References: <2026092954-reappoint-enquirer-7872@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- include/linux/if_vlan.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index f4eb8dd7308a2..e63081a9d7db8 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -351,6 +351,9 @@ static inline int __vlan_insert_inner_tag(struct sk_buff *skb, { struct vlan_ethhdr *veth; + if (unlikely(!pskb_may_pull(skb, mac_len))) + return -EINVAL; + if (skb_cow_head(skb, VLAN_HLEN) < 0) return -ENOMEM; -- 2.53.0