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/algif_hash.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/algif_hash.c')
| -rw-r--r-- | crypto/algif_hash.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c index 54fc90e8..5e92bd27 100644 --- a/crypto/algif_hash.c +++ b/crypto/algif_hash.c @@ -239,7 +239,8 @@ unlock: return err ?: len; } -static int hash_accept(struct socket *sock, struct socket *newsock, int flags) +static int hash_accept(struct socket *sock, struct socket *newsock, int flags, + bool kern) { struct sock *sk = sock->sk; struct alg_sock *ask = alg_sk(sk); @@ -260,7 +261,7 @@ static int hash_accept(struct socket *sock, struct socket *newsock, int flags) if (err) return err; - err = af_alg_accept(ask->parent, newsock); + err = af_alg_accept(ask->parent, newsock, kern); if (err) return err; @@ -378,7 +379,7 @@ static int hash_recvmsg_nokey(struct socket *sock, struct msghdr *msg, } static int hash_accept_nokey(struct socket *sock, struct socket *newsock, - int flags) + int flags, bool kern) { int err; @@ -386,7 +387,7 @@ static int hash_accept_nokey(struct socket *sock, struct socket *newsock, if (err) return err; - return hash_accept(sock, newsock, flags); + return hash_accept(sock, newsock, flags, kern); } static struct proto_ops algif_hash_ops_nokey = { |