lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NETNS][IPV6] af_inet6 - allow socket creation per namespace

Browse Source 
Allow creation of IPv6 raw and datagram sockets in network namespaces
other than init_net.

Signed-off-by: Benjamin Thery <benjamin.thery@bull.net>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Benjamin Thery
2008-03-05 10:45:59 -08:00
committed by David S. Miller
parent 94911fe317
commit 075de93957
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net/ipv6/af_inet6.c
View File

@@ -92,9 +92,6 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol)
int try_loading_module = 0; int try_loading_module = 0;
int err; int err;
if (net != &init_net)
return -EAFNOSUPPORT;
if (sock->type != SOCK_RAW && if (sock->type != SOCK_RAW &&
sock->type != SOCK_DGRAM && sock->type != SOCK_DGRAM &&
!inet_ehash_secret) !inet_ehash_secret)
@@ -248,6 +245,7 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
struct inet_sock *inet = inet_sk(sk); struct inet_sock *inet = inet_sk(sk);
struct ipv6_pinfo *np = inet6_sk(sk); struct ipv6_pinfo *np = inet6_sk(sk);
struct net *net = sk->sk_net;
__be32 v4addr = 0; __be32 v4addr = 0;
unsigned short snum; unsigned short snum;
int addr_type = 0; int addr_type = 0;
@@ -278,7 +276,7 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
/* Check if the address belongs to the host. */ /* Check if the address belongs to the host. */
if (addr_type == IPV6_ADDR_MAPPED) { if (addr_type == IPV6_ADDR_MAPPED) {
v4addr = addr->sin6_addr.s6_addr32[3]; v4addr = addr->sin6_addr.s6_addr32[3];
if (inet_addr_type(&init_net, v4addr) != RTN_LOCAL) { if (inet_addr_type(net, v4addr) != RTN_LOCAL) {
err = -EADDRNOTAVAIL; err = -EADDRNOTAVAIL;
goto out; goto out;
} }
@@ -300,7 +298,7 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
err = -EINVAL; err = -EINVAL;
goto out; goto out;
} }
dev = dev_get_by_index(&init_net, sk->sk_bound_dev_if); dev = dev_get_by_index(net, sk->sk_bound_dev_if);
if (!dev) { if (!dev) {
err = -ENODEV; err = -ENODEV;
goto out; goto out;
@@ -312,7 +310,7 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
*/ */
v4addr = LOOPBACK4_IPV6; v4addr = LOOPBACK4_IPV6;
if (!(addr_type & IPV6_ADDR_MULTICAST)) { if (!(addr_type & IPV6_ADDR_MULTICAST)) {
if (!ipv6_chk_addr(&init_net, &addr->sin6_addr, if (!ipv6_chk_addr(net, &addr->sin6_addr,
dev, 0)) { dev, 0)) {
if (dev) if (dev)
dev_put(dev); dev_put(dev);