Fix ip6ip6 crash for collect_md skbs
Subsystems (4)
Daniel Borkmann
maintainercover Fix ip6ip6 crash for collect_md skbs
Fix a NULL pointer deref panic I ran into for regular ip6ip6 tunnel devices when collect_md populated skbs were redirected to them for xmit. See patches for further details, thanks!
Daniel Borkmann (2):
net: Consolidate common blackhole dst ops
net, bpf: Fix ip6ip6 crash with collect_md populated skbs
include/net/dst.h | 11 +++++++++ net/core/dst.c | 59 +++++++++++++++++++++++++++++++++-------------- net/ipv4/route.c | 45 +++++++----------------------------- net/ipv6/route.c | 36 ++++++++--------------------- 4 files changed, 70 insertions(+), 81 deletions(-)
Signature · 1 line
2.21.0
Daniel Borkmann
maintainerPATCH 1/2 net: Consolidate common blackhole dst ops
Move generic blackhole dst ops to the core and use them from both ipv4_dst_blackhole_ops and ip6_dst_blackhole_ops where possible. No functional change otherwise. We need these also in other locations and having to define them over and over again is not great.
--- include/net/dst.h | 11 +++++++++++ net/core/dst.c | 38 ++++++++++++++++++++++++++++++++++++++ net/ipv4/route.c | 45 ++++++++------------------------------------- net/ipv6/route.c | 36 +++++++++--------------------------- 4 files changed, 66 insertions(+), 64 deletions(-)
include/net/dst.h +11 -0
@@ -550,4 +550,15 @@ static inline void skb_dst_update_pmtu_no_confirm(struct sk_buff *skb, u32 mtu) dst->ops->update_pmtu(dst, NULL, skb, mtu, false); } +struct dst_entry *dst_blackhole_check (struct dst_entry *dst,u32 cookie); +void dst_blackhole_update_pmtu (struct dst_entry *dst,struct sock *sk, +struct sk_buff *skb,u32 mtu,bool confirm_neigh); +void dst_blackhole_redirect (struct dst_entry *dst,struct sock *sk, +struct sk_buff *skb); +u32 *dst_blackhole_cow_metrics (struct dst_entry *dst,unsigned long old); +struct neighbour *dst_blackhole_neigh_lookup (const struct dst_entry *dst, +struct sk_buff *skb, +const void *daddr); +unsigned int dst_blackhole_mtu (const struct dst_entry *dst); +#endif /* _NET_DST_H */
net/core/dst.c +38 -0
@@ -237,6 +237,44 @@ void __dst_destroy_metrics_generic(struct dst_entry *dst, unsigned long old) }EXPORT_SYMBOL (__dst_destroy_metrics_generic); +struct dst_entry *dst_blackhole_check (struct dst_entry *dst,u32 cookie) +{ +return NULL ; +} + +u32 *dst_blackhole_cow_metrics (struct dst_entry *dst,unsigned long old) +{ +return NULL ; +} + +struct neighbour *dst_blackhole_neigh_lookup (const struct dst_entry *dst, +struct sk_buff *skb, +const void *daddr) +{ +return NULL ; +} + +void dst_blackhole_update_pmtu (struct dst_entry *dst,struct sock *sk, +struct sk_buff *skb,u32 mtu, +bool confirm_neigh) +{ +} +EXPORT_SYMBOL_GPL (dst_blackhole_update_pmtu); + +void dst_blackhole_redirect (struct dst_entry *dst,struct sock *sk, +struct sk_buff *skb) +{ +} +EXPORT_SYMBOL_GPL (dst_blackhole_redirect); + +unsigned int dst_blackhole_mtu (const struct dst_entry *dst) +{ +unsigned int mtu =dst_metric_raw (dst,RTAX_MTU ); + +return mtu ? : dst->dev->mtu; +} +EXPORT_SYMBOL_GPL (dst_blackhole_mtu); +static struct dst_ops md_dst_ops = { .family =AF_UNSPEC , };
net/ipv4/route.c +8 -37
52 lines not on this page · raw message
net/ipv6/route.c +9 -27
@@ -260,34 +260,16 @@ static struct dst_ops ip6_dst_ops_template = { .confirm_neigh = ip6_confirm_neigh, }; -static unsigned int ip6_blackhole_mtu (const struct dst_entry *dst) -{ -unsigned int mtu =dst_metric_raw (dst,RTAX_MTU ); - -return mtu ? : dst->dev->mtu; -} - -static void ip6_rt_blackhole_update_pmtu (struct dst_entry *dst,struct sock *sk, -struct sk_buff *skb,u32 mtu, -bool confirm_neigh) -{ -} - -static void ip6_rt_blackhole_redirect (struct dst_entry *dst,struct sock *sk, -struct sk_buff *skb) -{ -} -static struct dst_ops ip6_dst_blackhole_ops = { - .family =AF_INET6 , - .destroy = ip6_dst_destroy, - .check = ip6_dst_check, - .mtu = ip6_blackhole_mtu, - .default_advmss = ip6_default_advmss, - .update_pmtu = ip6_rt_blackhole_update_pmtu, - .redirect = ip6_rt_blackhole_redirect, - .cow_metrics = dst_cow_metrics_generic, - .neigh_lookup = ip6_dst_neigh_lookup, + .family =AF_INET6 , + .default_advmss = ip6_default_advmss, + .neigh_lookup = ip6_dst_neigh_lookup, + .check = ip6_dst_check, + .destroy = ip6_dst_destroy, + .cow_metrics = dst_cow_metrics_generic, + .update_pmtu = dst_blackhole_update_pmtu, + .redirect = dst_blackhole_redirect, + .mtu = dst_blackhole_mtu, };static const u32 ip6_template_metrics[RTAX_MAX ] = {
Signature · 1 line
2.21.0
Daniel Borkmann
maintainerPATCH 2/2 net, bpf: Fix ip6ip6 crash with collect_md populated skbs
In reply to Daniel BorkmannI ran into a crash where setting up a ip6ip6 tunnel device which was /not/ set to collect_md mode was receiving collect_md populated skbs for xmit.
The BPF prog was populating the skb via bpf_skb_set_tunnel_key() which is assigning special metadata dst entry and then redirecting the skb to the device, taking ip6_tnl_start_xmit() -> ipxip6_tnl_xmit() -> ip6_tnl_xmit() and in the latter it performs a neigh lookup based on skb_dst(skb) where we trigger a NULL pointer dereference on dst->ops->neigh_lookup() since the md_dst_ops do not populate neigh_lookup callback with a fake handler.
Transform the md_dst_ops into generic dst_blackhole_ops that can also be reused elsewhere when needed, and use them for the metadata dst entries as callback ops.
Also, remove the dst_md_discard{,_out}() ops and rely on dst_discard{,_out}() from dst_init() which free the skb the same way modulo the splat. Given we will be able to recover just fine from there, avoid any potential splats iff this gets ever triggered in future (or worse, panic on warns when set).
--- net/core/dst.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-)
net/core/dst.c +9 -22
@@ -275,37 +275,24 @@ unsigned int dst_blackhole_mtu(const struct dst_entry *dst) }EXPORT_SYMBOL_GPL (dst_blackhole_mtu); -static struct dst_ops md_dst_ops = { - .family =AF_UNSPEC , +static struct dst_ops dst_blackhole_ops = { + .family =AF_UNSPEC , + .neigh_lookup = dst_blackhole_neigh_lookup, + .check = dst_blackhole_check, + .cow_metrics = dst_blackhole_cow_metrics, + .update_pmtu = dst_blackhole_update_pmtu, + .redirect = dst_blackhole_redirect, + .mtu = dst_blackhole_mtu, }; -static int dst_md_discard_out (struct net *net,struct sock *sk,struct sk_buff *skb) -{ -WARN_ONCE (1 ,"Attempting to call output on metadata dst\n" ); -kfree_skb (skb); -return 0 ; -} - -static int dst_md_discard (struct sk_buff *skb) -{ -WARN_ONCE (1 ,"Attempting to call input on metadata dst\n" ); -kfree_skb (skb); -return 0 ; -} -static void __metadata_dst_init (struct metadata_dst *md_dst,enum metadata_type type,u8 optslen) - {struct dst_entry *dst; dst = &md_dst->dst; -dst_init (dst, &md_dst_ops,NULL ,1 ,DST_OBSOLETE_NONE , +dst_init (dst, &dst_blackhole_ops,NULL ,1 ,DST_OBSOLETE_NONE ,DST_METADATA |DST_NOCOUNT ); - - dst->input = dst_md_discard; - dst->output = dst_md_discard_out; -memset (dst +1 ,0 ,sizeof (*md_dst) + optslen -sizeof (*dst)); md_dst->type = type; }
Signature · 1 line
2.21.0
This series was applied to netdev/net.git (refs/heads/master):
Hello:
This series was applied to netdev/net.git (refs/heads/master):
Quoted 9 lines · On Wed, 10 Mar 2021 01:38:08 +0100 you wrote:
Fix a NULL pointer deref panic I ran into for regular ip6ip6 tunnel devices when
collect_mdpopulated skbs were redirected to them for xmit. See patches for further details, thanks!Daniel Borkmann (2):
net: Consolidate common blackhole dst ops
net, bpf: Fix ip6ip6 crash withcollect_mdpopulated skbs[...]
Here is the summary with links:
- [net,1/2] net: Consolidate common blackhole dst ops
https://git.kernel.org/netdev/net/c/c4c877b27324 - [net,2/2] net, bpf: Fix ip6ip6 crash with collect_md populated skbs https://git.kernel.org/netdev/net/c/a188bb5638d4
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html