niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

[NETNS][IPV6] route6 - make route6 per namespace

Browse source 
This patch makes the routing engine use the network namespaces to
access routing informations: Add a network namespace parameter to
ipv6_route_ioctl and propagate the network namespace value to all the
routing code that have not yet been changed.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: Benjamin Thery <benjamin.thery@bull.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Daniel Lezcano 2008-03-04 13:47:47 -08:00 • committed by David S. Miller
parent 7b4da53229
commit 5578689a4e
3 changed files with 54 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/net/ip6_route.h
View file

@ -49,7 +49,9 @@ extern struct dst_entry * ip6_route_output(struct sock *sk,
extern int ip6_route_init(void); extern int ip6_route_init(void);
extern void ip6_route_cleanup(void); extern void ip6_route_cleanup(void);
extern int ipv6_route_ioctl(unsigned int cmd, void __user *arg); extern int ipv6_route_ioctl(struct net *net,
unsigned int cmd,
void __user *arg);
extern int ip6_route_add(struct fib6_config *cfg); extern int ip6_route_add(struct fib6_config *cfg);
extern int ip6_ins_rt(struct rt6_info *); extern int ip6_ins_rt(struct rt6_info *);

3
net/ipv6/af_inet6.c
View file

@ -440,6 +440,7 @@ EXPORT_SYMBOL(inet6_getname);
int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
struct net *net = sk->sk_net;
switch(cmd) switch(cmd)
{ {
@ -452,7 +453,7 @@ int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
case SIOCADDRT: case SIOCADDRT:
case SIOCDELRT: case SIOCDELRT:
return(ipv6_route_ioctl(cmd,(void __user *)arg)); return(ipv6_route_ioctl(net, cmd, (void __user *)arg));
case SIOCSIFADDR: case SIOCSIFADDR:
return addrconf_add_ifaddr((void __user *) arg); return addrconf_add_ifaddr((void __user *) arg);

98
net/ipv6/route.c
View file

@ -609,7 +609,7 @@ static int __ip6_ins_rt(struct rt6_info *rt, struct nl_info *info)
int ip6_ins_rt(struct rt6_info *rt) int ip6_ins_rt(struct rt6_info *rt)
{ {
struct nl_info info = { struct nl_info info = {
.nl_net = &init_net, .nl_net = rt->rt6i_dev->nd_net,
}; };
return __ip6_ins_rt(rt, &info); return __ip6_ins_rt(rt, &info);
} }
@ -746,6 +746,7 @@ static struct rt6_info *ip6_pol_route_input(struct fib6_table *table,
void ip6_route_input(struct sk_buff *skb) void ip6_route_input(struct sk_buff *skb)
{ {
struct ipv6hdr *iph = ipv6_hdr(skb); struct ipv6hdr *iph = ipv6_hdr(skb);
struct net *net = skb->dev->nd_net;
int flags = RT6_LOOKUP_F_HAS_SADDR; int flags = RT6_LOOKUP_F_HAS_SADDR;
struct flowi fl = { struct flowi fl = {
.iif = skb->dev->ifindex, .iif = skb->dev->ifindex,
@ -763,7 +764,7 @@ void ip6_route_input(struct sk_buff *skb)
if (rt6_need_strict(&iph->daddr)) if (rt6_need_strict(&iph->daddr))
flags |= RT6_LOOKUP_F_IFACE; flags |= RT6_LOOKUP_F_IFACE;
skb->dst = fib6_rule_lookup(&init_net, &fl, flags, ip6_pol_route_input); skb->dst = fib6_rule_lookup(net, &fl, flags, ip6_pol_route_input);
} }
static struct rt6_info *ip6_pol_route_output(struct fib6_table *table, static struct rt6_info *ip6_pol_route_output(struct fib6_table *table,
@ -891,12 +892,12 @@ static void ip6_rt_update_pmtu(struct dst_entry *dst, u32 mtu)
static int ipv6_get_mtu(struct net_device *dev); static int ipv6_get_mtu(struct net_device *dev);
static inline unsigned int ipv6_advmss(unsigned int mtu) static inline unsigned int ipv6_advmss(struct net *net, unsigned int mtu)
{ {
mtu -= sizeof(struct ipv6hdr) + sizeof(struct tcphdr); mtu -= sizeof(struct ipv6hdr) + sizeof(struct tcphdr);
if (mtu < init_net.ipv6.sysctl.ip6_rt_min_advmss) if (mtu < net->ipv6.sysctl.ip6_rt_min_advmss)
mtu = init_net.ipv6.sysctl.ip6_rt_min_advmss; mtu = net->ipv6.sysctl.ip6_rt_min_advmss;
/* /*
* Maximal non-jumbo IPv6 payload is IPV6_MAXPLEN and * Maximal non-jumbo IPv6 payload is IPV6_MAXPLEN and
@ -918,6 +919,7 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
{ {
struct rt6_info *rt; struct rt6_info *rt;
struct inet6_dev *idev = in6_dev_get(dev); struct inet6_dev *idev = in6_dev_get(dev);
struct net *net = dev->nd_net;
if (unlikely(idev == NULL)) if (unlikely(idev == NULL))
return NULL; return NULL;
@ -940,7 +942,7 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
atomic_set(&rt->u.dst.__refcnt, 1); atomic_set(&rt->u.dst.__refcnt, 1);
rt->u.dst.metrics[RTAX_HOPLIMIT-1] = 255; rt->u.dst.metrics[RTAX_HOPLIMIT-1] = 255;
rt->u.dst.metrics[RTAX_MTU-1] = ipv6_get_mtu(rt->rt6i_dev); rt->u.dst.metrics[RTAX_MTU-1] = ipv6_get_mtu(rt->rt6i_dev);
rt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(dst_mtu(&rt->u.dst)); rt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(net, dst_mtu(&rt->u.dst));
rt->u.dst.output = ip6_output; rt->u.dst.output = ip6_output;
#if 0 /* there's no chance to use these for ndisc */ #if 0 /* there's no chance to use these for ndisc */
@ -956,7 +958,7 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
icmp6_dst_gc_list = &rt->u.dst; icmp6_dst_gc_list = &rt->u.dst;
spin_unlock_bh(&icmp6_dst_lock); spin_unlock_bh(&icmp6_dst_lock);
fib6_force_start_gc(dev->nd_net); fib6_force_start_gc(net);
out: out:
return &rt->u.dst; return &rt->u.dst;
@ -1049,6 +1051,7 @@ int ipv6_get_hoplimit(struct net_device *dev)
int ip6_route_add(struct fib6_config *cfg) int ip6_route_add(struct fib6_config *cfg)
{ {
int err; int err;
struct net *net = cfg->fc_nlinfo.nl_net;
struct rt6_info *rt = NULL; struct rt6_info *rt = NULL;
struct net_device *dev = NULL; struct net_device *dev = NULL;
struct inet6_dev *idev = NULL; struct inet6_dev *idev = NULL;
@ -1063,7 +1066,7 @@ int ip6_route_add(struct fib6_config *cfg)
#endif #endif
if (cfg->fc_ifindex) { if (cfg->fc_ifindex) {
err = -ENODEV; err = -ENODEV;
dev = dev_get_by_index(&init_net, cfg->fc_ifindex); dev = dev_get_by_index(net, cfg->fc_ifindex);
if (!dev) if (!dev)
goto out; goto out;
idev = in6_dev_get(dev); idev = in6_dev_get(dev);
@ -1074,7 +1077,7 @@ int ip6_route_add(struct fib6_config *cfg)
if (cfg->fc_metric == 0) if (cfg->fc_metric == 0)
cfg->fc_metric = IP6_RT_PRIO_USER; cfg->fc_metric = IP6_RT_PRIO_USER;
table = fib6_new_table(&init_net, cfg->fc_table); table = fib6_new_table(net, cfg->fc_table);
if (table == NULL) { if (table == NULL) {
err = -ENOBUFS; err = -ENOBUFS;
goto out; goto out;
@ -1121,12 +1124,12 @@ int ip6_route_add(struct fib6_config *cfg)
if ((cfg->fc_flags & RTF_REJECT) || if ((cfg->fc_flags & RTF_REJECT) ||
(dev && (dev->flags&IFF_LOOPBACK) && !(addr_type&IPV6_ADDR_LOOPBACK))) { (dev && (dev->flags&IFF_LOOPBACK) && !(addr_type&IPV6_ADDR_LOOPBACK))) {
/* hold loopback dev/idev if we haven't done so. */ /* hold loopback dev/idev if we haven't done so. */
if (dev != init_net.loopback_dev) { if (dev != net->loopback_dev) {
if (dev) { if (dev) {
dev_put(dev); dev_put(dev);
in6_dev_put(idev); in6_dev_put(idev);
} }
dev = init_net.loopback_dev; dev = net->loopback_dev;
dev_hold(dev); dev_hold(dev);
idev = in6_dev_get(dev); idev = in6_dev_get(dev);
if (!idev) { if (!idev) {
@ -1163,7 +1166,7 @@ int ip6_route_add(struct fib6_config *cfg)
if (!(gwa_type&IPV6_ADDR_UNICAST)) if (!(gwa_type&IPV6_ADDR_UNICAST))
goto out; goto out;
grt = rt6_lookup(&init_net, gw_addr, NULL, cfg->fc_ifindex, 1); grt = rt6_lookup(net, gw_addr, NULL, cfg->fc_ifindex, 1);
err = -EHOSTUNREACH; err = -EHOSTUNREACH;
if (grt == NULL) if (grt == NULL)
@ -1230,7 +1233,7 @@ install_route:
if (!rt->u.dst.metrics[RTAX_MTU-1]) if (!rt->u.dst.metrics[RTAX_MTU-1])
rt->u.dst.metrics[RTAX_MTU-1] = ipv6_get_mtu(dev); rt->u.dst.metrics[RTAX_MTU-1] = ipv6_get_mtu(dev);
if (!rt->u.dst.metrics[RTAX_ADVMSS-1]) if (!rt->u.dst.metrics[RTAX_ADVMSS-1])
rt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(dst_mtu(&rt->u.dst)); rt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(net, dst_mtu(&rt->u.dst));
rt->u.dst.dev = dev; rt->u.dst.dev = dev;
rt->rt6i_idev = idev; rt->rt6i_idev = idev;
rt->rt6i_table = table; rt->rt6i_table = table;
@ -1271,7 +1274,7 @@ static int __ip6_del_rt(struct rt6_info *rt, struct nl_info *info)
int ip6_del_rt(struct rt6_info *rt) int ip6_del_rt(struct rt6_info *rt)
{ {
struct nl_info info = { struct nl_info info = {
.nl_net = &init_net, .nl_net = rt->rt6i_dev->nd_net,
}; };
return __ip6_del_rt(rt, &info); return __ip6_del_rt(rt, &info);
} }
@ -1283,7 +1286,7 @@ static int ip6_route_del(struct fib6_config *cfg)
struct rt6_info *rt; struct rt6_info *rt;
int err = -ESRCH; int err = -ESRCH;
table = fib6_get_table(&init_net, cfg->fc_table); table = fib6_get_table(cfg->fc_nlinfo.nl_net, cfg->fc_table);
if (table == NULL) if (table == NULL)
return err; return err;
@ -1382,6 +1385,7 @@ static struct rt6_info *ip6_route_redirect(struct in6_addr *dest,
struct net_device *dev) struct net_device *dev)
{ {
int flags = RT6_LOOKUP_F_HAS_SADDR; int flags = RT6_LOOKUP_F_HAS_SADDR;
struct net *net = dev->nd_net;
struct ip6rd_flowi rdfl = { struct ip6rd_flowi rdfl = {
.fl = { .fl = {
.oif = dev->ifindex, .oif = dev->ifindex,
@ -1398,8 +1402,7 @@ static struct rt6_info *ip6_route_redirect(struct in6_addr *dest,
if (rt6_need_strict(dest)) if (rt6_need_strict(dest))
flags |= RT6_LOOKUP_F_IFACE; flags |= RT6_LOOKUP_F_IFACE;
return (struct rt6_info *)fib6_rule_lookup(&init_net, return (struct rt6_info *)fib6_rule_lookup(net, (struct flowi *)&rdfl,
(struct flowi *)&rdfl,
flags, __ip6_route_redirect); flags, __ip6_route_redirect);
} }
@ -1457,7 +1460,8 @@ void rt6_redirect(struct in6_addr *dest, struct in6_addr *src,
nrt->rt6i_nexthop = neigh_clone(neigh); nrt->rt6i_nexthop = neigh_clone(neigh);
/* Reset pmtu, it may be better */ /* Reset pmtu, it may be better */
nrt->u.dst.metrics[RTAX_MTU-1] = ipv6_get_mtu(neigh->dev); nrt->u.dst.metrics[RTAX_MTU-1] = ipv6_get_mtu(neigh->dev);
nrt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(dst_mtu(&nrt->u.dst)); nrt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(neigh->dev->nd_net,
dst_mtu(&nrt->u.dst));
if (ip6_ins_rt(nrt)) if (ip6_ins_rt(nrt))
goto out; goto out;
@ -1485,9 +1489,10 @@ void rt6_pmtu_discovery(struct in6_addr *daddr, struct in6_addr *saddr,
struct net_device *dev, u32 pmtu) struct net_device *dev, u32 pmtu)
{ {
struct rt6_info *rt, *nrt; struct rt6_info *rt, *nrt;
struct net *net = dev->nd_net;
int allfrag = 0; int allfrag = 0;
rt = rt6_lookup(dev->nd_net, daddr, saddr, dev->ifindex, 0); rt = rt6_lookup(net, daddr, saddr, dev->ifindex, 0);
if (rt == NULL) if (rt == NULL)
return; return;
@ -1520,7 +1525,7 @@ void rt6_pmtu_discovery(struct in6_addr *daddr, struct in6_addr *saddr,
rt->u.dst.metrics[RTAX_MTU-1] = pmtu; rt->u.dst.metrics[RTAX_MTU-1] = pmtu;
if (allfrag) if (allfrag)
rt->u.dst.metrics[RTAX_FEATURES-1] |= RTAX_FEATURE_ALLFRAG; rt->u.dst.metrics[RTAX_FEATURES-1] |= RTAX_FEATURE_ALLFRAG;
dst_set_expires(&rt->u.dst, init_net.ipv6.sysctl.ip6_rt_mtu_expires); dst_set_expires(&rt->u.dst, net->ipv6.sysctl.ip6_rt_mtu_expires);
rt->rt6i_flags |= RTF_MODIFIED|RTF_EXPIRES; rt->rt6i_flags |= RTF_MODIFIED|RTF_EXPIRES;
goto out; goto out;
} }
@ -1546,7 +1551,7 @@ void rt6_pmtu_discovery(struct in6_addr *daddr, struct in6_addr *saddr,
* which is 10 mins. After 10 mins the decreased pmtu is expired * which is 10 mins. After 10 mins the decreased pmtu is expired
* and detecting PMTU increase will be automatically happened. * and detecting PMTU increase will be automatically happened.
*/ */
dst_set_expires(&nrt->u.dst, init_net.ipv6.sysctl.ip6_rt_mtu_expires); dst_set_expires(&nrt->u.dst, net->ipv6.sysctl.ip6_rt_mtu_expires);
nrt->rt6i_flags |= RTF_DYNAMIC|RTF_EXPIRES; nrt->rt6i_flags |= RTF_DYNAMIC|RTF_EXPIRES;
ip6_ins_rt(nrt); ip6_ins_rt(nrt);
@ -1659,7 +1664,7 @@ struct rt6_info *rt6_get_dflt_router(struct in6_addr *addr, struct net_device *d
struct rt6_info *rt; struct rt6_info *rt;
struct fib6_table *table; struct fib6_table *table;
table = fib6_get_table(&init_net, RT6_TABLE_DFLT); table = fib6_get_table(dev->nd_net, RT6_TABLE_DFLT);
if (table == NULL) if (table == NULL)
return NULL; return NULL;
@ -1688,6 +1693,9 @@ struct rt6_info *rt6_add_dflt_router(struct in6_addr *gwaddr,
.fc_ifindex = dev->ifindex, .fc_ifindex = dev->ifindex,
.fc_flags = RTF_GATEWAY | RTF_ADDRCONF | RTF_DEFAULT | .fc_flags = RTF_GATEWAY | RTF_ADDRCONF | RTF_DEFAULT |
RTF_UP | RTF_EXPIRES | RTF_PREF(pref), RTF_UP | RTF_EXPIRES | RTF_PREF(pref),
.fc_nlinfo.pid = 0,
.fc_nlinfo.nlh = NULL,
.fc_nlinfo.nl_net = dev->nd_net,
}; };
ipv6_addr_copy(&cfg.fc_gateway, gwaddr); ipv6_addr_copy(&cfg.fc_gateway, gwaddr);
@ -1720,7 +1728,8 @@ restart:
read_unlock_bh(&table->tb6_lock); read_unlock_bh(&table->tb6_lock);
} }
static void rtmsg_to_fib6_config(struct in6_rtmsg *rtmsg, static void rtmsg_to_fib6_config(struct net *net,
struct in6_rtmsg *rtmsg,
struct fib6_config *cfg) struct fib6_config *cfg)
{ {
memset(cfg, 0, sizeof(*cfg)); memset(cfg, 0, sizeof(*cfg));
@ -1733,14 +1742,14 @@ static void rtmsg_to_fib6_config(struct in6_rtmsg *rtmsg,
cfg->fc_src_len = rtmsg->rtmsg_src_len; cfg->fc_src_len = rtmsg->rtmsg_src_len;
cfg->fc_flags = rtmsg->rtmsg_flags; cfg->fc_flags = rtmsg->rtmsg_flags;
cfg->fc_nlinfo.nl_net = &init_net; cfg->fc_nlinfo.nl_net = net;
ipv6_addr_copy(&cfg->fc_dst, &rtmsg->rtmsg_dst); ipv6_addr_copy(&cfg->fc_dst, &rtmsg->rtmsg_dst);
ipv6_addr_copy(&cfg->fc_src, &rtmsg->rtmsg_src); ipv6_addr_copy(&cfg->fc_src, &rtmsg->rtmsg_src);
ipv6_addr_copy(&cfg->fc_gateway, &rtmsg->rtmsg_gateway); ipv6_addr_copy(&cfg->fc_gateway, &rtmsg->rtmsg_gateway);
} }
int ipv6_route_ioctl(unsigned int cmd, void __user *arg) int ipv6_route_ioctl(struct net *net, unsigned int cmd, void __user *arg)
{ {
struct fib6_config cfg; struct fib6_config cfg;
struct in6_rtmsg rtmsg; struct in6_rtmsg rtmsg;
@ -1756,7 +1765,7 @@ int ipv6_route_ioctl(unsigned int cmd, void __user *arg)
if (err) if (err)
return -EFAULT; return -EFAULT;
rtmsg_to_fib6_config(&rtmsg, &cfg); rtmsg_to_fib6_config(net, &rtmsg, &cfg);
rtnl_lock(); rtnl_lock();
switch (cmd) { switch (cmd) {
@ -1835,21 +1844,22 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
const struct in6_addr *addr, const struct in6_addr *addr,
int anycast) int anycast)
{ {
struct net *net = idev->dev->nd_net;
struct rt6_info *rt = ip6_dst_alloc(); struct rt6_info *rt = ip6_dst_alloc();
if (rt == NULL) if (rt == NULL)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
dev_hold(init_net.loopback_dev); dev_hold(net->loopback_dev);
in6_dev_hold(idev); in6_dev_hold(idev);
rt->u.dst.flags = DST_HOST; rt->u.dst.flags = DST_HOST;
rt->u.dst.input = ip6_input; rt->u.dst.input = ip6_input;
rt->u.dst.output = ip6_output; rt->u.dst.output = ip6_output;
rt->rt6i_dev = init_net.loopback_dev; rt->rt6i_dev = net->loopback_dev;
rt->rt6i_idev = idev; rt->rt6i_idev = idev;
rt->u.dst.metrics[RTAX_MTU-1] = ipv6_get_mtu(rt->rt6i_dev); rt->u.dst.metrics[RTAX_MTU-1] = ipv6_get_mtu(rt->rt6i_dev);
rt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(dst_mtu(&rt->u.dst)); rt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(net, dst_mtu(&rt->u.dst));
rt->u.dst.metrics[RTAX_HOPLIMIT-1] = -1; rt->u.dst.metrics[RTAX_HOPLIMIT-1] = -1;
rt->u.dst.obsolete = -1; rt->u.dst.obsolete = -1;
@ -1866,7 +1876,7 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
ipv6_addr_copy(&rt->rt6i_dst.addr, addr); ipv6_addr_copy(&rt->rt6i_dst.addr, addr);
rt->rt6i_dst.plen = 128; rt->rt6i_dst.plen = 128;
rt->rt6i_table = fib6_get_table(&init_net, RT6_TABLE_LOCAL); rt->rt6i_table = fib6_get_table(net, RT6_TABLE_LOCAL);
atomic_set(&rt->u.dst.__refcnt, 1); atomic_set(&rt->u.dst.__refcnt, 1);
@ -1898,6 +1908,7 @@ static int rt6_mtu_change_route(struct rt6_info *rt, void *p_arg)
{ {
struct rt6_mtu_change_arg *arg = (struct rt6_mtu_change_arg *) p_arg; struct rt6_mtu_change_arg *arg = (struct rt6_mtu_change_arg *) p_arg;
struct inet6_dev *idev; struct inet6_dev *idev;
struct net *net = arg->dev->nd_net;
/* In IPv6 pmtu discovery is not optional, /* In IPv6 pmtu discovery is not optional,
so that RTAX_MTU lock cannot disable it. so that RTAX_MTU lock cannot disable it.
@ -1929,7 +1940,7 @@ static int rt6_mtu_change_route(struct rt6_info *rt, void *p_arg)
(dst_mtu(&rt->u.dst) < arg->mtu && (dst_mtu(&rt->u.dst) < arg->mtu &&
dst_mtu(&rt->u.dst) == idev->cnf.mtu6))) { dst_mtu(&rt->u.dst) == idev->cnf.mtu6))) {
rt->u.dst.metrics[RTAX_MTU-1] = arg->mtu; rt->u.dst.metrics[RTAX_MTU-1] = arg->mtu;
rt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(arg->mtu); rt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(net, arg->mtu);
} }
return 0; return 0;
} }
@ -2024,13 +2035,9 @@ errout:
static int inet6_rtm_delroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) static int inet6_rtm_delroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
{ {
struct net *net = skb->sk->sk_net;
struct fib6_config cfg; struct fib6_config cfg;
int err; int err;
if (net != &init_net)
return -EINVAL;
err = rtm_to_fib6_config(skb, nlh, &cfg); err = rtm_to_fib6_config(skb, nlh, &cfg);
if (err < 0) if (err < 0)
return err; return err;
@ -2040,13 +2047,9 @@ static int inet6_rtm_delroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *a
static int inet6_rtm_newroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) static int inet6_rtm_newroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
{ {
struct net *net = skb->sk->sk_net;
struct fib6_config cfg; struct fib6_config cfg;
int err; int err;
if (net != &init_net)
return -EINVAL;
err = rtm_to_fib6_config(skb, nlh, &cfg); err = rtm_to_fib6_config(skb, nlh, &cfg);
if (err < 0) if (err < 0)
return err; return err;
@ -2190,9 +2193,6 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh, void
struct flowi fl; struct flowi fl;
int err, iif = 0; int err, iif = 0;
if (net != &init_net)
return -EINVAL;
err = nlmsg_parse(nlh, sizeof(*rtm), tb, RTA_MAX, rtm_ipv6_policy); err = nlmsg_parse(nlh, sizeof(*rtm), tb, RTA_MAX, rtm_ipv6_policy);
if (err < 0) if (err < 0)
goto errout; goto errout;
@ -2222,7 +2222,7 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh, void
if (iif) { if (iif) {
struct net_device *dev; struct net_device *dev;
dev = __dev_get_by_index(&init_net, iif); dev = __dev_get_by_index(net, iif);
if (!dev) { if (!dev) {
err = -ENODEV; err = -ENODEV;
goto errout; goto errout;
@ -2252,7 +2252,7 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh, void
goto errout; goto errout;
} }
err = rtnl_unicast(skb, &init_net, NETLINK_CB(in_skb).pid); err = rtnl_unicast(skb, net, NETLINK_CB(in_skb).pid);
errout: errout:
return err; return err;
} }
@ -2260,6 +2260,7 @@ errout:
void inet6_rt_notify(int event, struct rt6_info *rt, struct nl_info *info) void inet6_rt_notify(int event, struct rt6_info *rt, struct nl_info *info)
{ {
struct sk_buff *skb; struct sk_buff *skb;
struct net *net = info->nl_net;
u32 seq; u32 seq;
int err; int err;
@ -2278,11 +2279,11 @@ void inet6_rt_notify(int event, struct rt6_info *rt, struct nl_info *info)
kfree_skb(skb); kfree_skb(skb);
goto errout; goto errout;
} }
err = rtnl_notify(skb, &init_net, info->pid, err = rtnl_notify(skb, net, info->pid, RTNLGRP_IPV6_ROUTE,
RTNLGRP_IPV6_ROUTE, info->nlh, gfp_any()); info->nlh, gfp_any());
errout: errout:
if (err < 0) if (err < 0)
rtnl_set_sk_err(&init_net, RTNLGRP_IPV6_ROUTE, err); rtnl_set_sk_err(net, RTNLGRP_IPV6_ROUTE, err);
} }
/* /*
@ -2544,6 +2545,7 @@ static void ip6_route_net_exit(struct net *net)
proc_net_remove(net, "ipv6_route"); proc_net_remove(net, "ipv6_route");
proc_net_remove(net, "rt6_stats"); proc_net_remove(net, "rt6_stats");
#endif #endif
rt6_ifdown(net, NULL);
} }
static struct pernet_operations ip6_route_net_ops = { static struct pernet_operations ip6_route_net_ops = {
@ -2592,7 +2594,6 @@ fib6_rules_init:
xfrm6_init: xfrm6_init:
xfrm6_fini(); xfrm6_fini();
out_fib6_init: out_fib6_init:
rt6_ifdown(&init_net, NULL);
fib6_gc_cleanup(); fib6_gc_cleanup();
out_kmem_cache: out_kmem_cache:
kmem_cache_destroy(ip6_dst_ops.kmem_cachep); kmem_cache_destroy(ip6_dst_ops.kmem_cachep);
@ -2604,7 +2605,6 @@ void ip6_route_cleanup(void)
unregister_pernet_subsys(&ip6_route_net_ops); unregister_pernet_subsys(&ip6_route_net_ops);
fib6_rules_cleanup(); fib6_rules_cleanup();
xfrm6_fini(); xfrm6_fini();
rt6_ifdown(&init_net, NULL);
fib6_gc_cleanup(); fib6_gc_cleanup();
kmem_cache_destroy(ip6_dst_ops.kmem_cachep); kmem_cache_destroy(ip6_dst_ops.kmem_cachep);
} }