| Message ID | 5211F97B.4090209@cn.fujitsu.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, Aug 19, 2013 at 06:54:51PM +0800, Duan Jiong wrote: > From: Duan Jiong <duanj.fnst@cn.fujitsu.com> > > 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. > > Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com> > --- > include/net/ip6_route.h | 1 + > net/ipv6/ndisc.c | 4 +++- > net/ipv6/route.c | 21 +++++++++++++++++++++ > 3 files changed, 25 insertions(+), 1 deletions(-) > > diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h > index 260f83f..7966f54 100644 > --- a/include/net/ip6_route.h > +++ b/include/net/ip6_route.h > @@ -135,6 +135,7 @@ 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; > diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c > index 79aa965..04d31c2 100644 > --- a/net/ipv6/ndisc.c > +++ b/net/ipv6/ndisc.c > @@ -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; > + } Can't we just jump down to icmpv6_notify without introducing ip6_redirect_no_header? > > hdr = (u8 *)ndopts.nd_opts_rh; > hdr += 8; > diff --git a/net/ipv6/route.c b/net/ipv6/route.c > index b70f897..9934b87 100644 > --- a/net/ipv6/route.c > +++ b/net/ipv6/route.c > @@ -1178,6 +1178,27 @@ 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 ipv6hdr *iph = ipv6_hdr(skb); Thanks, Hannes -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello. On 08/19/2013 02:54 PM, Duan Jiong wrote: > From: Duan Jiong <duanj.fnst@cn.fujitsu.com> > 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. > Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com> [...] > diff --git a/net/ipv6/route.c b/net/ipv6/route.c > index b70f897..9934b87 100644 > --- a/net/ipv6/route.c > +++ b/net/ipv6/route.c > @@ -1178,6 +1178,27 @@ 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); > + struct rd_msg *msg = (struct rd_msg *)skb_transport_header(skb); Be consistent please: either put space after a typecast or not. > + struct dst_entry *dst; > + struct flowi6 fl6; WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
于 2013年08月19日 19:55, Hannes Frederic Sowa 写道: > On Mon, Aug 19, 2013 at 06:54:51PM +0800, Duan Jiong wrote: >> From: Duan Jiong <duanj.fnst@cn.fujitsu.com> >> >> 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. >> >> Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com> >> --- >> include/net/ip6_route.h | 1 + >> net/ipv6/ndisc.c | 4 +++- >> net/ipv6/route.c | 21 +++++++++++++++++++++ >> 3 files changed, 25 insertions(+), 1 deletions(-) >> >> diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h >> index 260f83f..7966f54 100644 >> --- a/include/net/ip6_route.h >> +++ b/include/net/ip6_route.h >> @@ -135,6 +135,7 @@ 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; >> diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c >> index 79aa965..04d31c2 100644 >> --- a/net/ipv6/ndisc.c >> +++ b/net/ipv6/ndisc.c >> @@ -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; >> + } > > Can't we just jump down to icmpv6_notify without introducing > ip6_redirect_no_header? > No, the function icmpv6_notify need the skb->data point the inner IP packet that triggered the sending of the ICMP Message, so when the Redirect Message has no Redirected Header option, it should not be handled in icmpv6_notify. >> >> hdr = (u8 *)ndopts.nd_opts_rh; >> hdr += 8; >> diff --git a/net/ipv6/route.c b/net/ipv6/route.c >> index b70f897..9934b87 100644 >> --- a/net/ipv6/route.c >> +++ b/net/ipv6/route.c >> @@ -1178,6 +1178,27 @@ 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 ipv6hdr *iph = ipv6_hdr(skb); > Thanks for you help, i will apply it in next version. Thanks, Duan -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
于 2013年08月20日 03:00, Sergei Shtylyov 写道: > Hello. > > On 08/19/2013 02:54 PM, Duan Jiong wrote: > >> From: Duan Jiong <duanj.fnst@cn.fujitsu.com> > >> 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. > >> Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com> > [...] > >> diff --git a/net/ipv6/route.c b/net/ipv6/route.c >> index b70f897..9934b87 100644 >> --- a/net/ipv6/route.c >> +++ b/net/ipv6/route.c >> @@ -1178,6 +1178,27 @@ 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); >> + struct rd_msg *msg = (struct rd_msg *)skb_transport_header(skb); > > Be consistent please: either put space after a typecast or not. > Thanks for you help, i will apply it in next version. Thanks, Duan -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 260f83f..7966f54 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -135,6 +135,7 @@ 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; diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 79aa965..04d31c2 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -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; diff --git a/net/ipv6/route.c b/net/ipv6/route.c index b70f897..9934b87 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -1178,6 +1178,27 @@ 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); + 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);