1 files changed, 3 insertions, 5 deletions

diff --git a/net/ipv4/udp_tunnel.c b/net/ipv4/udp_tunnel.c
index 4e2837476967..933ea903f7b8 100644
--- a/net/ipv4/udp_tunnel.c
+++ b/net/ipv4/udp_tunnel.c
@@ -15,12 +15,10 @@ int udp_sock_create4(struct net *net, struct udp_port_cfg *cfg,
         struct socket *sock = NULL;
         struct sockaddr_in udp_addr;
 
-        err = sock_create_kern(&init_net, AF_INET, SOCK_DGRAM, 0, &sock);
+        err = sock_create_kern(net, AF_INET, SOCK_DGRAM, 0, &sock);
         if (err < 0)
                 goto error;
 
-        sk_change_net(sock->sk, net);
-
         udp_addr.sin_family = AF_INET;
         udp_addr.sin_addr = cfg->local_ip;
         udp_addr.sin_port = cfg->local_udp_port;
@@ -47,7 +45,7 @@ int udp_sock_create4(struct net *net, struct udp_port_cfg *cfg,
 error:
         if (sock) {
                 kernel_sock_shutdown(sock, SHUT_RDWR);
-                sk_release_kernel(sock->sk);
+                sock_release(sock);
         }
         *sockp = NULL;
         return err;
@@ -101,7 +99,7 @@ void udp_tunnel_sock_release(struct socket *sock)
 {
         rcu_assign_sk_user_data(sock->sk, NULL);
         kernel_sock_shutdown(sock, SHUT_RDWR);
-        sk_release_kernel(sock->sk);
+        sock_release(sock);
 }
 EXPORT_SYMBOL_GPL(udp_tunnel_sock_release);