diff options
author | Dave Airlie <airlied@redhat.com> | 2017-03-23 12:05:13 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-03-23 12:05:13 +1000 |
commit | 9d35114e78bdac3f2e36fc0ba928322209717f90 (patch) | |
tree | 63ce7ec0e2be0fc7a026ef97b76042cf0c17eeff /crypto/af_alg.c | |
parent | 07d045372921bfaa843ea00749c150b099ca0a49 (diff) | |
parent | f27596611714bbcd2e2459974f9713106cf0f351 (diff) | |
download | linux-crypto-9d35114e78bdac3f2e36fc0ba928322209717f90.tar.gz linux-crypto-9d35114e78bdac3f2e36fc0ba928322209717f90.zip |
BackMerge tag 'v4.11-rc3' into drm-next
Linux 4.11-rc3 as requested by Daniel
Diffstat (limited to 'crypto/af_alg.c')
-rw-r--r-- | crypto/af_alg.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c index f5e18c2a..690deca1 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -266,7 +266,7 @@ unlock: return err; } -int af_alg_accept(struct sock *sk, struct socket *newsock) +int af_alg_accept(struct sock *sk, struct socket *newsock, bool kern) { struct alg_sock *ask = alg_sk(sk); const struct af_alg_type *type; @@ -281,7 +281,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock) if (!type) goto unlock; - sk2 = sk_alloc(sock_net(sk), PF_ALG, GFP_KERNEL, &alg_proto, 0); + sk2 = sk_alloc(sock_net(sk), PF_ALG, GFP_KERNEL, &alg_proto, kern); err = -ENOMEM; if (!sk2) goto unlock; @@ -323,9 +323,10 @@ unlock: } EXPORT_SYMBOL_GPL(af_alg_accept); -static int alg_accept(struct socket *sock, struct socket *newsock, int flags) +static int alg_accept(struct socket *sock, struct socket *newsock, int flags, + bool kern) { - return af_alg_accept(sock->sk, newsock); + return af_alg_accept(sock->sk, newsock, kern); } static const struct proto_ops alg_proto_ops = { |