* [Devel] [PATCH hci-8.1] net/ip_gre: fix a host panic on a received ERSPAN packet
@ 2026-11-10 16:31 Denis V. Lunev
2026-11-10 16:35 ` no-reply
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Denis V. Lunev @ 2026-11-10 16:31 UTC (permalink / raw)
To: khorenko; +Cc: devel
From: Denis V. Lunev <den@openvz.org>
Commit a1049e020cdf ("ve/net/gre: Disable ERSPAN support in ip_gre
module") compiled erspan_net_ops out under CONFIG_VE but left the ERSPAN
receive and ICMP error paths in place. erspan_net_id is then never
assigned and stays 0, and net_generic(net, 0) does not return NULL: it
returns the length word of struct net_generic, which ptr[0] overlays.
ip_tunnel_lookup() passes its NULL check and reads itn->tunnels[] in
the first page. Once ip_gre is loaded, any GRE packet with protocol
ETH_P_ERSPAN or ETH_P_ERSPAN2 delivered to the node panics it in
softirq, and so does an ICMP error quoting such a header. The packet
can come from the network or from container root with a raw socket.
Return a NULL itn for ERSPAN under CONFIG_VE, so both paths miss the
lookup and handle the packet as one for a tunnel that does not exist.
Fixes: a1049e020cdf ("ve/net/gre: Disable ERSPAN support in ip_gre module")
https://virtuozzo.atlassian.net/browse/VSTOR-154362
Feature: net: disable ERSPAN support in ip_gre module
Signed-off-by: Denis V. Lunev <den@openvz.org>
---
net/ipv4/ip_gre.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index f618aae25033..c84548eebf80 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -120,8 +120,21 @@ static void erspan_build_header(struct sk_buff *skb,
static unsigned int ipgre_net_id __read_mostly;
static unsigned int gre_tap_net_id __read_mostly;
+#ifdef CONFIG_VE
+/* erspan_net_ops is compiled out, there is no erspan pernet state */
+static struct ip_tunnel_net *erspan_itn(struct net *net)
+{
+ return NULL;
+}
+#else
static unsigned int erspan_net_id __read_mostly;
+static struct ip_tunnel_net *erspan_itn(struct net *net)
+{
+ return net_generic(net, erspan_net_id);
+}
+#endif
+
static int ipgre_err(struct sk_buff *skb, u32 info,
const struct tnl_ptk_info *tpi)
{
@@ -151,7 +164,7 @@ static int ipgre_err(struct sk_buff *skb, u32 info,
itn = net_generic(net, gre_tap_net_id);
else if (tpi->proto == htons(ETH_P_ERSPAN) ||
tpi->proto == htons(ETH_P_ERSPAN2))
- itn = net_generic(net, erspan_net_id);
+ itn = erspan_itn(net);
else
itn = net_generic(net, ipgre_net_id);
@@ -279,7 +292,7 @@ static int erspan_rcv(struct sk_buff *skb, struct tnl_ptk_info *tpi,
ip_tunnel_flags_copy(flags, tpi->flags);
- itn = net_generic(net, erspan_net_id);
+ itn = erspan_itn(net);
iph = ip_hdr(skb);
if (is_erspan_type1(gre_hdr_len)) {
ver = 0;
--
2.53.0
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Devel] [PATCH hci-8.1] net/ip_gre: fix a host panic on a received ERSPAN packet
2026-11-10 16:31 [Devel] [PATCH hci-8.1] net/ip_gre: fix a host panic on a received ERSPAN packet Denis V. Lunev
@ 2026-11-10 16:35 ` no-reply
2026-11-12 13:07 ` Konstantin Khorenko
2026-11-12 13:08 ` Konstantin Khorenko
2 siblings, 0 replies; 4+ messages in thread
From: no-reply @ 2026-11-10 16:35 UTC (permalink / raw)
To: khorenko, Denis V. Lunev; +Cc: devel
> From: Denis V. Lunev <den@openvz.org>
>
> Commit a1049e020cdf ("ve/net/gre: Disable ERSPAN support in ip_gre
> module") compiled erspan_net_ops out under CONFIG_VE but left the ERSPAN
> receive and ICMP error paths in place. erspan_net_id is then never
> assigned and stays 0, and net_generic(net, 0) does not return NULL: it
> returns the length word of struct net_generic, which ptr[0] overlays.
> ip_tunnel_lookup() passes its NULL check and reads itn->tunnels[] in
> the first page. Once ip_gre is loaded, any GRE packet with protocol
> ETH_P_ERSPAN or ETH_P_ERSPAN2 delivered to the node panics it in
> softirq, and so does an ICMP error quoting such a header. The packet
> can come from the network or from container root with a raw socket.
>
> Return a NULL itn for ERSPAN under CONFIG_VE, so both paths miss the
> lookup and handle the packet as one for a tunnel that does not exist.
>
> Fixes: a1049e020cdf ("ve/net/gre: Disable ERSPAN support in ip_gre module")
>
> https://virtuozzo.atlassian.net/browse/VSTOR-154362
> Feature: net: disable ERSPAN support in ip_gre module
> Signed-off-by: Denis V. Lunev <den@openvz.org>
Sashiko has reviewed this patch and found no issues. It looks great!
--
Sashiko AI review · https://sashiko.vzint.dev/#/patchset/20261110163110.2776207-1-den@openvz.org?part=1
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Devel] [PATCH hci-8.1] net/ip_gre: fix a host panic on a received ERSPAN packet
2026-11-10 16:31 [Devel] [PATCH hci-8.1] net/ip_gre: fix a host panic on a received ERSPAN packet Denis V. Lunev
2026-11-10 16:35 ` no-reply
@ 2026-11-12 13:07 ` Konstantin Khorenko
2026-11-12 13:08 ` Konstantin Khorenko
2 siblings, 0 replies; 4+ messages in thread
From: Konstantin Khorenko @ 2026-11-12 13:07 UTC (permalink / raw)
To: Denis V. Lunev; +Cc: devel
Applying with these fixes on my side:
- the first paragraph split in three: what a1049e020cdf left behind,
why the lookup faults, who can trigger it; wording unchanged
- the blank line between Fixes: and the Jira URL dropped
--
Konstantin Khorenko,
Virtuozzo Linux Kernel Team
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Devel] [PATCH hci-8.1] net/ip_gre: fix a host panic on a received ERSPAN packet
2026-11-10 16:31 [Devel] [PATCH hci-8.1] net/ip_gre: fix a host panic on a received ERSPAN packet Denis V. Lunev
2026-11-10 16:35 ` no-reply
2026-11-12 13:07 ` Konstantin Khorenko
@ 2026-11-12 13:08 ` Konstantin Khorenko
2 siblings, 0 replies; 4+ messages in thread
From: Konstantin Khorenko @ 2026-11-12 13:08 UTC (permalink / raw)
To: Denis V. Lunev; +Cc: devel
On Tue, 10 Nov 2026 17:31:10 +0100, Denis V. Lunev wrote:
> net/ip_gre: fix a host panic on a received ERSPAN packet
Applied to branch-rh10-6.12.0-211.52.1.22.x.vz10-ovz, will be released in rh10-6.12.0-211.52.1.22.21.vz10, thanks!
[1/1] net/ip_gre: fix a host panic on a received ERSPAN packet
https://bitbucket.org/virtuozzocore/vzkernel.vzs/commits/820dc4ae04ee
--
Konstantin Khorenko,
Virtuozzo Linux Kernel Team
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-11-12 13:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-10 16:31 [Devel] [PATCH hci-8.1] net/ip_gre: fix a host panic on a received ERSPAN packet Denis V. Lunev
2026-11-10 16:35 ` no-reply
2026-11-12 13:07 ` Konstantin Khorenko
2026-11-12 13:08 ` Konstantin Khorenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox