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 31D104756BB; Fri, 7 Aug 2026 15:45:38 +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=1786117539; cv=none; b=SJRYNZiQ/SuKkMGCsN9PwAxP+3Ok3SMfbbsytp+l7w9HcKt9MNtDKidWFCl11QJIXl8Jb3pHbQGC5/RBSFW1HqPb/uolQo6W495jAfBuEZRXdZJTWSRrt/CZ1EnG0/hMQMDsdj7T/rLQoZyOWlLGhBJon01dbRz2yDkgxWw8Yl8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786117539; c=relaxed/simple; bh=uc00GA/l9T/8A3ck5ygr/4/Nd59nEdRrBxubLaTYZt4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Hz5cxr4JhjNzs2MerkdhAOMMmc/u0Lho1tme/5TYMbW250TZTwPDfKeM/+ahcQnwYONlkib6M9EW+6xD/qPgkEpykCd1xvMl3yp56a15m7fEffvk3ogyAxCejWgiF3uF/AxbMpCF2timoXxXw7pV+q2Fadldnc3lB0bdzxG7bKs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LQhmRkku; 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="LQhmRkku" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 88F441F000E9; Fri, 7 Aug 2026 15:45:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1786117538; bh=KQMXqjSVJigO3m3yc5zqaoDCDhcRDMYcHAxll+DXn70=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LQhmRkkuToNu2rbVMMRzNXdkATEdhWMBzxyKTprIXLgI7PglYhaTS20oKXCf4xd0U l5gMgn4pVBTfisaC7pLCG1kzn8tzFip4n00GV7WmvbTaeFXd4V9RkLMn8nvvX/tbup zxzNFjQQfD9DlYCMGsbOIek+zvYiHbyqupCuTuA0= 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 7.1 310/438] vxlan: use pskb_network_may_pull() in route_shortcircuit() Date: Fri, 7 Aug 2026 16:38:26 +0200 Message-ID: <20260807143434.580098172@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260807143428.008222056@linuxfoundation.org> References: <20260807143428.008222056@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 7.1-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 @@ -2112,7 +2112,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); @@ -2138,7 +2138,7 @@ static bool route_shortcircuit(struct ne */ if (!ipv6_mod_enabled()) 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(&nd_tbl, &pip6->daddr, dev);