[NETNS]: Process IP layer in the context of the correct namespace.

Replace all the rest of the init_net with a proper net on the IP layer.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 3 deletions

diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 0857f2d042cd..b854431047a4 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -449,7 +449,8 @@ static int do_ip_setsockopt(struct sock *sk, int level,
                 struct ip_options * opt = NULL;
                 if (optlen > 40 || optlen < 0)
                         goto e_inval;
-                err = ip_options_get_from_user(&init_net, &opt, optval, optlen);
+                err = ip_options_get_from_user(sk->sk_net, &opt,
+                                               optval, optlen);
                 if (err)
                         break;
                 if (inet->is_icsk) {
@@ -589,13 +590,13 @@ static int do_ip_setsockopt(struct sock *sk, int level,
                                 err = 0;
                                 break;
                         }
-                        dev = ip_dev_find(&init_net, mreq.imr_address.s_addr);
+                        dev = ip_dev_find(sk->sk_net, mreq.imr_address.s_addr);
                         if (dev) {
                                 mreq.imr_ifindex = dev->ifindex;
                                 dev_put(dev);
                         }
                 } else
-                        dev = __dev_get_by_index(&init_net, mreq.imr_ifindex);
+                        dev = __dev_get_by_index(sk->sk_net, mreq.imr_ifindex);
 
 
                 err = -EADDRNOTAVAIL;