| Message ID | 527C44E5.70606@cn.fujitsu.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, Nov 08, 2013 at 09:56:53AM +0800, Duan Jiong wrote: > > As the rfc 4191 said, the Router Preference and Lifetime values in a > ::/0 Route Information Option should override the preference and lifetime > values in the Router Advertisement header. But when the kernel deals with > a ::/0 Route Information Option, the rt6_get_route_info() always return > NULL, that means that overriding will not happen, because those default > routers were added without flag RTF_ROUTEINFO in rt6_add_dflt_router(). > > In order to deal with that condition, we should call rt6_get_dflt_router > when the prefix length is 0. > > Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com> Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org> 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
From: Duan Jiong <duanj.fnst@cn.fujitsu.com> Date: Fri, 08 Nov 2013 09:56:53 +0800 > > As the rfc 4191 said, the Router Preference and Lifetime values in a > ::/0 Route Information Option should override the preference and lifetime > values in the Router Advertisement header. But when the kernel deals with > a ::/0 Route Information Option, the rt6_get_route_info() always return > NULL, that means that overriding will not happen, because those default > routers were added without flag RTF_ROUTEINFO in rt6_add_dflt_router(). > > In order to deal with that condition, we should call rt6_get_dflt_router > when the prefix length is 0. > > Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com> Applied and queued up for -stable, thanks! -- 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/net/ipv6/route.c b/net/ipv6/route.c index c28cdda..7faa9d5 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -731,8 +731,11 @@ int rt6_route_rcv(struct net_device *dev, u8 *opt, int len, prefix = &prefix_buf; } - rt = rt6_get_route_info(net, prefix, rinfo->prefix_len, gwaddr, - dev->ifindex); + if (rinfo->prefix_len == 0) + rt = rt6_get_dflt_router(gwaddr, dev); + else + rt = rt6_get_route_info(net, prefix, rinfo->prefix_len, + gwaddr, dev->ifindex); if (rt && !lifetime) { ip6_del_rt(rt);
As the rfc 4191 said, the Router Preference and Lifetime values in a ::/0 Route Information Option should override the preference and lifetime values in the Router Advertisement header. But when the kernel deals with a ::/0 Route Information Option, the rt6_get_route_info() always return NULL, that means that overriding will not happen, because those default routers were added without flag RTF_ROUTEINFO in rt6_add_dflt_router(). In order to deal with that condition, we should call rt6_get_dflt_router when the prefix length is 0. Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com> --- net/ipv6/route.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)