[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.

[mirror_ubuntu-bionic-kernel.git] / net / ipv4 / ip_sockglue.c

diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index b854431047a46adffbe09ee621f2d4344c06ec80..d6e76f5229ccb4d9eb1c3193b8e8e0443a7fadc4 100644 (file)
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -449,7 +449,7 @@ 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(sk->sk_net, &opt,
+               err = ip_options_get_from_user(sock_net(sk), &opt,
                                               optval, optlen);
                if (err)
                        break;
@@ -590,13 +590,13 @@ static int do_ip_setsockopt(struct sock *sk, int level,
                                err = 0;
                                break;
                        }
-                       dev = ip_dev_find(sk->sk_net, mreq.imr_address.s_addr);
+                       dev = ip_dev_find(sock_net(sk), mreq.imr_address.s_addr);
                        if (dev) {
                                mreq.imr_ifindex = dev->ifindex;
                                dev_put(dev);
                        }
                } else
-                       dev = __dev_get_by_index(sk->sk_net, mreq.imr_ifindex);
+                       dev = __dev_get_by_index(sock_net(sk), mreq.imr_ifindex);
 
 
                err = -EADDRNOTAVAIL;