diff options
| author | Simon Horman <horms@verge.net.au> | 2011-01-22 13:48:01 +1100 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2011-01-22 13:48:01 +1100 |
| commit | 4b3fd57138c969dd940651fadf90db627254edbf (patch) | |
| tree | 79beb439ed57db89a1701901869a85c867434eb1 | |
| parent | 091bb34c143674d37a59b2d4857534f7106c5d7d (diff) | |
| download | linux-stable-4b3fd57138c969dd940651fadf90db627254edbf.tar.gz linux-stable-4b3fd57138c969dd940651fadf90db627254edbf.tar.bz2 linux-stable-4b3fd57138c969dd940651fadf90db627254edbf.zip | |
IPVS: Change sock_create_kernel() to __sock_create()
The recent netns changes omitted to change
sock_create_kernel() to __sock_create() in ip_vs_sync.c
The effect of this is that the interface will be selected in the
root-namespace, from my point of view it's a major bug.
Reported-by: Hans Schillstrom <hans@schillstrom.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_sync.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c index d1adf988eb08..d5a6e640ea45 100644 --- a/net/netfilter/ipvs/ip_vs_sync.c +++ b/net/netfilter/ipvs/ip_vs_sync.c @@ -1305,7 +1305,7 @@ static struct socket *make_send_sock(struct net *net) int result; /* First create a socket */ - result = sock_create_kern(PF_INET, SOCK_DGRAM, IPPROTO_UDP, &sock); + result = __sock_create(net, PF_INET, SOCK_DGRAM, IPPROTO_UDP, &sock, 1); if (result < 0) { pr_err("Error during creation of socket; terminating\n"); return ERR_PTR(result); @@ -1351,7 +1351,7 @@ static struct socket *make_receive_sock(struct net *net) int result; /* First create a socket */ - result = sock_create_kern(PF_INET, SOCK_DGRAM, IPPROTO_UDP, &sock); + result = __sock_create(net, PF_INET, SOCK_DGRAM, IPPROTO_UDP, &sock, 1); if (result < 0) { pr_err("Error during creation of socket; terminating\n"); return ERR_PTR(result); |