vxlan: put UDP socket in correct namespace
Move vxlan UDP socket to correct network namespace
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index f87a98f..51de9ed 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -1136,6 +1136,9 @@
pr_debug("UDP socket create failed\n");
return rc;
}
+ /* Put in proper namespace */
+ sk = vn->sock->sk;
+ sk_change_net(sk, net);
vxlan_addr.sin_port = htons(vxlan_port);
@@ -1144,13 +1147,12 @@
if (rc < 0) {
pr_debug("bind for UDP socket %pI4:%u (%d)\n",
&vxlan_addr.sin_addr, ntohs(vxlan_addr.sin_port), rc);
- sock_release(vn->sock);
+ sk_release_kernel(sk);
vn->sock = NULL;
return rc;
}
/* Disable multicast loopback */
- sk = vn->sock->sk;
inet_sk(sk)->mc_loop = 0;
/* Mark socket as an encapsulation socket. */
@@ -1169,7 +1171,7 @@
struct vxlan_net *vn = net_generic(net, vxlan_net_id);
if (vn->sock) {
- sock_release(vn->sock);
+ sk_release_kernel(vn->sock->sk);
vn->sock = NULL;
}
}