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 C951518E02A; Fri, 7 Aug 2026 15:22:49 +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=1786116170; cv=none; b=Op/4i+0YEXPeoN1au98ITjCMAxZGfwAmEttegXU1dZ3rfkVugQCM/+kwvfp1iVc7g2f7YOVmbOON/H8CBAHs9blwelyh2bIbrhbtGKJTwRAH1EtDJ6CWYcECvg0uj5WC1gnUXLOR1QwiMVO+aF/hyTWmfcUoneGwm+pqhImsHBo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786116170; c=relaxed/simple; bh=NnNJWD6JXgENyLf3cR0UvgUvT01ALWZ8jrNvNlrjw6o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Pfwt6fK/mmTitEuw1/bmI4QLW2ttTWrvsQsDuaCaCrscGnHl3VMqULpt+Y4JceF45pL/oDglNPpfFGwOEsX3vaA4aS/j/8HfI5W39KZ3RtYl4pmI4MxcnrbIomOrTItjJIA0aeiBPQkKfoqwC4uZ+nplPivZE+k0xz/FXglAIHg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=qpRuEl+d; 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="qpRuEl+d" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 30E311F000E9; Fri, 7 Aug 2026 15:22:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1786116169; bh=tZSTL+S83c0pIQGKpHIZwTbzregS/TSTGQPZwL7izKo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qpRuEl+d5RBBoVDbHSIuMUZnEnS92pNbwY2pNfOPcnw746NRPsh3OEWlfRitM2VlR gNl0w6reVmXjgxnkYx0xWXZ/WEG/ZsUwc2vPiZSYCz/p+RlNgBPVRY6U+v7exJUZsH BUfHx7VkGaHhCLt/WVsNmZp78GnC1eYI376J27aw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eric Dumazet , Vadim Fedorenko , Jakub Kicinski Subject: [PATCH 6.6 137/261] vxlan: use pskb_network_may_pull() in route_shortcircuit() Date: Fri, 7 Aug 2026 16:38:14 +0200 Message-ID: <20260807143418.321901913@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260807143415.358597922@linuxfoundation.org> References: <20260807143415.358597922@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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Dumazet commit 26bb2dd0a8839617e2c79ffbbe1923f8e4bab9fb upstream. route_shortcircuit() currently calls pskb_may_pull(skb, sizeof(struct iphdr)) (or ipv6hdr), which checks if bytes are available starting from skb->data. However, in vxlan_xmit(), skb->data points to the MAC header, so skb_network_offset(skb) is ETH_HLEN (14 bytes). Using pskb_may_pull(skb, 20) only checks 20 bytes from skb->data (which is 14 bytes MAC header + 6 bytes of IP header), leaving the rest of the IP header potentially un-pulled in non-linear frags. Subsequent dereferences of ip_hdr(skb)->daddr can read beyond the pulled linear buffer length. Fix this by using pskb_network_may_pull(), which adds skb_network_offset(skb) to the length check to ensure the full network header is present in the linear buffer. Fixes: e4f67addf158 ("add DOVE extensions for VXLAN") Cc: stable@vger.kernel.org Signed-off-by: Eric Dumazet Reviewed-by: Vadim Fedorenko Link: https://patch.msgid.link/20260723144249.759100-5-edumazet@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/vxlan/vxlan_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/vxlan/vxlan_core.c +++ b/drivers/net/vxlan/vxlan_core.c @@ -2111,7 +2111,7 @@ static bool route_shortcircuit(struct ne { struct iphdr *pip; - if (!pskb_may_pull(skb, sizeof(struct iphdr))) + if (!pskb_network_may_pull(skb, sizeof(struct iphdr))) return false; pip = ip_hdr(skb); n = neigh_lookup(&arp_tbl, &pip->daddr, dev); @@ -2137,7 +2137,7 @@ static bool route_shortcircuit(struct ne */ if (!ipv6_stub->nd_tbl) return false; - if (!pskb_may_pull(skb, sizeof(struct ipv6hdr))) + if (!pskb_network_may_pull(skb, sizeof(struct ipv6hdr))) return false; pip6 = ipv6_hdr(skb); n = neigh_lookup(ipv6_stub->nd_tbl, &pip6->daddr, dev);