ipv6: handle Redirect ICMP Message with no Redirected Header option
Subsystems (3)
PATCH v2 1/1 ipv6: handle Redirect ICMP Message with no Redirected Header option
From: Duan Jiong <[email protected]>
rfc 4861 says the Redirected Header option is optional, so the kernel should not drop the Redirect Message that has no Redirected Header option. In this patch, the function ip6_redirect_no_header() is introduced to deal with that condition.
--- include/net/ip6_route.h | 2 ++ net/ipv6/ndisc.c | 4 +++- net/ipv6/route.c | 22 ++++++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletions(-)
include/net/ip6_route.h +2 -0
@@ -135,6 +135,8 @@ extern void ip6_update_pmtu(struct sk_buff *skb, struct net *net, __be32 mtu,extern void ip6_sk_update_pmtu (struct sk_buff *skb,struct sock *sk,__be32 mtu);extern void ip6_redirect (struct sk_buff *skb,struct net *net,int oif,u32 mark); +extern void ip6_redirect_no_header (struct sk_buff *skb,struct net *net,int oif, +u32 mark);extern void ip6_sk_redirect (struct sk_buff *skb,struct sock *sk);struct netlink_callback ;
net/ipv6/ndisc.c +3 -1
@@ -1369,8 +1369,10 @@ static void ndisc_redirect_rcv(struct sk_buff *skb)if (!ndisc_parse_options (msg->opt, ndoptlen, &ndopts))return ; -if (!ndopts.nd_opts_rh) +if (!ndopts.nd_opts_rh) { +ip6_redirect_no_header (skb,dev_net (skb->dev),0 ,0 );return ; + } hdr = (u8 *)ndopts.nd_opts_rh; hdr +=8 ;
net/ipv6/route.c +22 -0
@@ -1178,6 +1178,28 @@ void ip6_redirect(struct sk_buff *skb, struct net *net, int oif, u32 mark) }EXPORT_SYMBOL_GPL (ip6_redirect); +void ip6_redirect_no_header (struct sk_buff *skb,struct net *net,int oif, +u32 mark) +{ +const struct ipv6hdr *iph = (struct ipv6hdr *)skb_network_header (skb); +const struct rd_msg *msg = (struct rd_msg *)skb_transport_header (skb); +struct dst_entry *dst; +struct flowi6 fl6; + +memset (&fl6,0 ,sizeof (fl6)); + fl6.flowi6_oif = oif; + fl6.flowi6_mark = mark; + fl6.flowi6_flags =0 ; + fl6.daddr = msg->dest; + fl6.saddr = iph->daddr; + + dst =ip6_route_output (net,NULL , &fl6); +if (!dst->error) +rt6_do_redirect (dst,NULL , skb); +dst_release (dst); +} +EXPORT_SYMBOL_GPL (ip6_redirect_no_header); +void ip6_sk_redirect (struct sk_buff *skb,struct sock *sk) {ip6_redirect (skb,sock_net (sk), sk->sk_bound_dev_if, sk->sk_mark);
Signature · 1 line
1.7.3.1
net/ipv6/route.c void ip6_redirect(struct sk_buff *skb, struct net *net, int oif, u32 mark) · line 1184
Quoted 10 lines · Duan Jiong
net/ipv6/route.c +4
-0@@ -1178,6 +1178,28 @@ void ip6_redirect(struct sk_buff *skb, struct net *net, int oif, u32 mark) }EXPORT_SYMBOL_GPL (ip6_redirect); +void ip6_redirect_no_header (struct sk_buff *skb,struct net *net,int oif, +u32 mark) +{ +const struct ipv6hdr *iph = (struct ipv6hdr *)skb_network_header (skb);
Was there a problem with ipv6_hdr?
Quoted 11 lines
net/ipv6/route.c +11
-0+const struct rd_msg *msg = (struct rd_msg *)skb_transport_header (skb); +struct dst_entry *dst; +struct flowi6 fl6; + +memset (&fl6,0 ,sizeof (fl6)); + fl6.flowi6_oif = oif; + fl6.flowi6_mark = mark; + fl6.flowi6_flags =0 ; + fl6.daddr = msg->dest; + fl6.saddr = iph->daddr; +
net/ipv6/route.c void ip6_redirect(struct sk_buff *skb, struct net *net, int oif, u32 mark) · line 1205
Quoted 10 lines
net/ipv6/route.c +7
-0+ dst =ip6_route_output (net,NULL , &fl6); +if (!dst->error) +rt6_do_redirect (dst,NULL , skb); +dst_release (dst); +} +EXPORT_SYMBOL_GPL (ip6_redirect_no_header); +void ip6_sk_redirect (struct sk_buff *skb,struct sock *sk) {ip6_redirect (skb,sock_net (sk), sk->sk_bound_dev_if, sk->sk_mark);
Introducing a new function here is the right thing. Maybe you could have a look how these redirects could be fed to raw sockets, too?
Thanks,
Hannes
Quoted 7 lines · Hannes Frederic Sowa
Quoted 6 lines · Duan Jiong
net/ipv6/route.c +0
-0@@ -1178,6 +1178,28 @@ void ip6_redirect(struct sk_buff *skb, struct net *net, int oif, u32 mark) }EXPORT_SYMBOL_GPL (ip6_redirect);
Quoted 7 lines
net/ipv6/route.c void ip6_redirect(struct sk_buff *skb, struct net *net, int oif, u32 mark) · line 1184
Quoted 4 lines
net/ipv6/route.c +4
-0+void ip6_redirect_no_header (struct sk_buff *skb,struct net *net,int oif, +u32 mark) +{ +const struct ipv6hdr *iph = (struct ipv6hdr *)skb_network_header (skb);Was there a problem with
ipv6_hdr?
Actually ipv6_hdr is better, and i will modify it.
Quoted 16 lines
Quoted 16 lines
net/ipv6/route.c +16
-0+const struct rd_msg *msg = (struct rd_msg *)skb_transport_header (skb); +struct dst_entry *dst; +struct flowi6 fl6; + +memset (&fl6,0 ,sizeof (fl6)); + fl6.flowi6_oif = oif; + fl6.flowi6_mark = mark; + fl6.flowi6_flags =0 ; + fl6.daddr = msg->dest; + fl6.saddr = iph->daddr; + + dst =ip6_route_output (net,NULL , &fl6); +if (!dst->error) +rt6_do_redirect (dst,NULL , skb); +dst_release (dst); +}
Quoted 9 lines
net/ipv6/route.c void ip6_redirect(struct sk_buff *skb, struct net *net, int oif, u32 mark) · line 1205
Quoted 5 lines
net/ipv6/route.c +2
-0+EXPORT_SYMBOL_GPL (ip6_redirect_no_header); +void ip6_sk_redirect (struct sk_buff *skb,struct sock *sk) {ip6_redirect (skb,sock_net (sk), sk->sk_bound_dev_if, sk->sk_mark);Introducing a new function here is the right thing. Maybe you could have a look how these redirects could be fed to raw sockets, too?
Because of no Redirected Header option, so we don't have enough information to find out the related raw socket. So, there is no need to deal with that condition.
Thanks,
Duan
Quoted 6 lines · Duan Jiong
Quoted 3 lines
Introducing a new function here is the right thing. Maybe you could have a look how these redirects could be fed to raw sockets, too?
Because of no Redirected Header option, so we don't have enough information to find out the related raw socket. So, there is no need to deal with that condition.
Ah, of course. I thought we could look up the socket solely by src and dst address. I forgot about the protocol.