diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2015-05-08 22:09:13 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-05-11 10:50:17 -0400 |
commit | 11aa9c28b4209242a9de0a661a7b3405adb568a0 (patch) | |
tree | d0dda021d89c17c54d54d227269f937d2d73b542 /crypto/af_alg.c | |
parent | eeb1bd5c40edb0e2fd925c8535e2fdebdbc5cef2 (diff) |
net: Pass kern from net_proto_family.create to sk_alloc
In preparation for changing how struct net is refcounted
on kernel sockets pass the knowledge that we are creating
a kernel socket from sock_create_kern through to sk_alloc.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'crypto/af_alg.c')
-rw-r--r-- | crypto/af_alg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c index f22cc56fd1b3..5ad0d5354535 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c | |||
@@ -244,7 +244,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock) | |||
244 | if (!type) | 244 | if (!type) |
245 | goto unlock; | 245 | goto unlock; |
246 | 246 | ||
247 | sk2 = sk_alloc(sock_net(sk), PF_ALG, GFP_KERNEL, &alg_proto); | 247 | sk2 = sk_alloc(sock_net(sk), PF_ALG, GFP_KERNEL, &alg_proto, 0); |
248 | err = -ENOMEM; | 248 | err = -ENOMEM; |
249 | if (!sk2) | 249 | if (!sk2) |
250 | goto unlock; | 250 | goto unlock; |
@@ -324,7 +324,7 @@ static int alg_create(struct net *net, struct socket *sock, int protocol, | |||
324 | return -EPROTONOSUPPORT; | 324 | return -EPROTONOSUPPORT; |
325 | 325 | ||
326 | err = -ENOMEM; | 326 | err = -ENOMEM; |
327 | sk = sk_alloc(net, PF_ALG, GFP_KERNEL, &alg_proto); | 327 | sk = sk_alloc(net, PF_ALG, GFP_KERNEL, &alg_proto, kern); |
328 | if (!sk) | 328 | if (!sk) |
329 | goto out; | 329 | goto out; |
330 | 330 | ||