projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nvme-loop: remove some code duplication
[linux-2.6-microblaze.git]
/
crypto
/
af_alg.c
diff --git
a/crypto/af_alg.c
b/crypto/af_alg.c
index
f5e18c2
..
690deca
100644
(file)
--- a/
crypto/af_alg.c
+++ b/
crypto/af_alg.c
@@
-266,7
+266,7
@@
unlock:
return err;
}
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;
{
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;
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;
err = -ENOMEM;
if (!sk2)
goto unlock;
@@
-323,9
+323,10
@@
unlock:
}
EXPORT_SYMBOL_GPL(af_alg_accept);
}
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 = {
}
static const struct proto_ops alg_proto_ops = {