[NETNS]: Pass namespace through ip_rt_ioctl.

... up to rtentry_to_fib_config

Acked-by: Benjamin Thery <benjamin.thery@bull.net>
Acked-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 6 insertions, 6 deletions

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index d76f8d8d5eba..bcf8c8a4a3ad 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -795,7 +795,7 @@ int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 case SIOCADDRT:
                 case SIOCDELRT:
                 case SIOCRTMSG:
-                        err = ip_rt_ioctl(cmd, (void __user *)arg);
+                        err = ip_rt_ioctl(sk->sk_net, cmd, (void __user *)arg);
                         break;
                 case SIOCDARP:
                 case SIOCGARP:
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 8b44e3195242..15909a9fa9b2 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -437,7 +437,7 @@ static int rtentry_to_fib_config(struct net *net, int cmd, struct rtentry *rt,
  *      Handle IP routing ioctl calls. These are used to manipulate the routing tables
  */
 
-int ip_rt_ioctl(unsigned int cmd, void __user *arg)
+int ip_rt_ioctl(struct net *net, unsigned int cmd, void __user *arg)
 {
         struct fib_config cfg;
         struct rtentry rt;
@@ -453,18 +453,18 @@ int ip_rt_ioctl(unsigned int cmd, void __user *arg)
                         return -EFAULT;
 
                 rtnl_lock();
-                err = rtentry_to_fib_config(&init_net, cmd, &rt, &cfg);
+                err = rtentry_to_fib_config(net, cmd, &rt, &cfg);
                 if (err == 0) {
                         struct fib_table *tb;
 
                         if (cmd == SIOCDELRT) {
-                                tb = fib_get_table(&init_net, cfg.fc_table);
+                                tb = fib_get_table(net, cfg.fc_table);
                                 if (tb)
                                         err = tb->tb_delete(tb, &cfg);
                                 else
                                         err = -ESRCH;
                         } else {
-                                tb = fib_new_table(&init_net, cfg.fc_table);
+                                tb = fib_new_table(net, cfg.fc_table);
                                 if (tb)
                                         err = tb->tb_insert(tb, &cfg);
                                 else
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 4bc3a57c183d..a52b5853aaa8 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -302,7 +302,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
 
         mm_segment_t oldfs = get_fs();
         set_fs(get_ds());
-        res = ip_rt_ioctl(cmd, (void __user *) arg);
+        res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
         set_fs(oldfs);
         return res;
 }