sctp: disable BH before calling udp_tunnel_xmit_skb()
Subsystems (4)
cover sctp: disable BH before calling udp_tunnel_xmit_skb()
Fixes CVE-2026-53070: sctp: disable BH before calling udp_tunnel_xmit_skb()
Petr Machata (1):
net: ipv6: Make udp_tunnel6_xmit_skb() void
Xin Long (1):
sctp: disable BH before calling udp_tunnel_xmit_skb()
include/net/udp_tunnel.h | 14 +++++++------- net/ipv6/ip6_udp_tunnel.c | 15 +++++++-------- net/sctp/ipv6.c | 9 ++++++--- net/sctp/protocol.c | 2 ++ net/tipc/udp_media.c | 10 +++++----- 5 files changed, 27 insertions(+), 23 deletions(-)
Signature · 1 line
2.43.0
PATCH 1/2 net: ipv6: Make udp_tunnel6_xmit_skb() void
From: Petr Machata <[email protected]>
commit 6a7d88ca15f73c5c570c372238f71d63da1fda55 upstream.
The function always returns zero, thus the return value does not carry any signal. Just make it void.
Most callers already ignore the return value. However:
- Refold arguments of the call from sctp_v6_xmit() so that they fit into the 80-column limit.
- tipc_udp_xmit() initializes err from the return value, but that should already be always zero at that point. So there's no practical change, but elision of the assignment prompts a couple more tweaks to clean up the function.
--- include/net/udp_tunnel.h | 14 +++++++------- net/ipv6/ip6_udp_tunnel.c | 15 +++++++-------- net/sctp/ipv6.c | 7 ++++--- net/tipc/udp_media.c | 10 +++++----- 4 files changed, 23 insertions(+), 23 deletions(-)
include/net/udp_tunnel.h +7 -7
@@ -152,13 +152,13 @@ void udp_tunnel_xmit_skb(struct rtable *rt, struct sock *sk, struct sk_buff *skb __be16 df, __be16 src_port, __be16 dst_port, bool xnet, bool nocheck); -int udp_tunnel6_xmit_skb (struct dst_entry *dst,struct sock *sk, -struct sk_buff *skb, -struct net_device *dev, -const struct in6_addr *saddr, -const struct in6_addr *daddr, -__u8 prio,__u8 ttl,__be32 label, -__be16 src_port,__be16 dst_port,bool nocheck); +void udp_tunnel6_xmit_skb (struct dst_entry *dst,struct sock *sk, +struct sk_buff *skb, +struct net_device *dev, +const struct in6_addr *saddr, +const struct in6_addr *daddr, +__u8 prio,__u8 ttl,__be32 label, +__be16 src_port,__be16 dst_port,bool nocheck);void udp_tunnel_sock_release (struct socket *sock);
net/ipv6/ip6_udp_tunnel.c +7 -8
@@ -74,13 +74,13 @@ int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg, }EXPORT_SYMBOL_GPL (udp_sock_create6); -int udp_tunnel6_xmit_skb (struct dst_entry *dst,struct sock *sk, -struct sk_buff *skb, -struct net_device *dev, -const struct in6_addr *saddr, -const struct in6_addr *daddr, -__u8 prio,__u8 ttl,__be32 label, -__be16 src_port,__be16 dst_port,bool nocheck) +void udp_tunnel6_xmit_skb (struct dst_entry *dst,struct sock *sk, +struct sk_buff *skb, +struct net_device *dev, +const struct in6_addr *saddr, +const struct in6_addr *daddr, +__u8 prio,__u8 ttl,__be32 label, +__be16 src_port,__be16 dst_port,bool nocheck) {struct udphdr *uh;struct ipv6hdr *ip6h;
@@ -109,7 +109,6 @@ int udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sock *sk, ip6h->saddr = *saddr;ip6tunnel_xmit (sk, skb, dev); -return 0 ; }EXPORT_SYMBOL_GPL (udp_tunnel6_xmit_skb);
net/sctp/ipv6.c +4 -3
@@ -261,9 +261,10 @@ static int sctp_v6_xmit(struct sk_buff *skb, struct sctp_transport *t)skb_set_inner_ipproto (skb,IPPROTO_SCTP ); label =ip6_make_flowlabel (sock_net (sk), skb, fl6->flowlabel, true, fl6); -return udp_tunnel6_xmit_skb (dst, sk, skb,NULL , &fl6->saddr, - &fl6->daddr, tclass,ip6_dst_hoplimit (dst), - label,sctp_sk (sk)->udp_port, t->encap_port, false); +udp_tunnel6_xmit_skb (dst, sk, skb,NULL , &fl6->saddr, &fl6->daddr, + tclass,ip6_dst_hoplimit (dst), label, +sctp_sk (sk)->udp_port, t->encap_port, false); +return 0 ; }/* Returns the dst cache entry for the given source and destination ip
net/tipc/udp_media.c +5 -5
@@ -172,7 +172,7 @@ static int tipc_udp_xmit(struct net *net, struct sk_buff *skb, struct udp_media_addr *dst, struct dst_cache *cache) { struct dst_entry *ndst; -int ttl, err =0 ; +int ttl, err;local_bh_disable (); ndst =dst_cache_get (cache);
@@ -217,13 +217,13 @@ static int tipc_udp_xmit(struct net *net, struct sk_buff *skb, dst_cache_set_ip6(cache, ndst, &fl6.saddr); } ttl =ip6_dst_hoplimit (ndst); - err =udp_tunnel6_xmit_skb (ndst, ub->ubsock->sk, skb,NULL , - &src->ipv6, &dst->ipv6,0 , ttl,0 , - src->port, dst->port, false); +udp_tunnel6_xmit_skb (ndst, ub->ubsock->sk, skb,NULL , + &src->ipv6, &dst->ipv6,0 , ttl,0 , + src->port, dst->port, false);#endif }local_bh_enable (); -return err; +return 0 ; tx_error:local_bh_enable ();
Signature · 1 line
2.43.0
PATCH 2/2 sctp: disable BH before calling udp_tunnel_xmit_skb()
In reply to Alexander MartyniukFrom: Xin Long <[email protected]>
commit 2cd7e6971fc2787408ceef17906ea152791448cf upstream.
udp_tunnel_xmit_skb() / udp_tunnel6_xmit_skb() are expected to run with BH disabled. After commit 6f1a9140ecda ("add xmit recursion limit to tunnel xmit functions"), on the path:
udp(6)_tunnel_xmit_skb() -> ip(6)tunnel_xmit()
dev_xmit_recursion_inc()/dec() must stay balanced on the same CPU.
Without local_bh_disable(), the context may move between CPUs, which can break the inc/dec pairing. This may lead to incorrect recursion level detection and cause packets to be dropped in ip(6)_tunnel_xmit() or __dev_queue_xmit().
Fix it by disabling BH around both IPv4 and IPv6 SCTP UDP xmit paths.
In my testing, after enabling the SCTP over UDP:
# ip net exec ha sysctl -w net.sctp.udp_port=9899 # ip net exec ha sysctl -w net.sctp.encap_port=9899 # ip net exec hb sysctl -w net.sctp.udp_port=9899 # ip net exec hb sysctl -w net.sctp.encap_port=9899
# ip net exec ha iperf3 -s
- without this patch:
# ip net exec hb iperf3 -c 192.168.0.1 --sctp [ 5] 0.00-10.00 sec 37.2 MBytes 31.2 Mbits/sec sender [ 5] 0.00-10.00 sec 37.1 MBytes 31.1 Mbits/sec receiver
- with this patch:
# ip net exec hb iperf3 -c 192.168.0.1 --sctp [ 5] 0.00-10.00 sec 3.14 GBytes 2.69 Gbits/sec sender [ 5] 0.00-10.00 sec 3.14 GBytes 2.69 Gbits/sec receiver
--- net/sctp/ipv6.c | 2 ++ net/sctp/protocol.c | 2 ++ 2 files changed, 4 insertions(+)
net/sctp/ipv6.c +2 -0
@@ -261,9 +261,11 @@ static int sctp_v6_xmit(struct sk_buff *skb, struct sctp_transport *t)skb_set_inner_ipproto (skb,IPPROTO_SCTP ); label =ip6_make_flowlabel (sock_net (sk), skb, fl6->flowlabel, true, fl6); +local_bh_disable ();udp_tunnel6_xmit_skb (dst, sk, skb,NULL , &fl6->saddr, &fl6->daddr, tclass,ip6_dst_hoplimit (dst), label,sctp_sk (sk)->udp_port, t->encap_port, false); +local_bh_enable ();return 0 ; }
net/sctp/protocol.c +2 -0
@@ -1086,9 +1086,11 @@ static inline int sctp_v4_xmit(struct sk_buff *skb, struct sctp_transport *t)skb_reset_inner_mac_header (skb);skb_reset_inner_transport_header (skb);skb_set_inner_ipproto (skb,IPPROTO_SCTP ); +local_bh_disable ();udp_tunnel_xmit_skb (dst_rtable (dst), sk, skb, fl4->saddr, fl4->daddr, dscp,ip4_dst_hoplimit (dst), df,sctp_sk (sk)->udp_port, t->encap_port, false, false); +local_bh_enable ();return 0 ; }
Signature · 1 line
2.43.0