projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge linux-block/for-4.3/core into md/for-linux
[deliverable/linux.git]
/
crypto
/
algif_aead.c
diff --git
a/crypto/algif_aead.c
b/crypto/algif_aead.c
index e0408a480d2f4eb8f818c9590ec9a3d7d166e25d..0aa6fdfb448a8c4081e06aa9dcb041433dc280a5 100644
(file)
--- a/
crypto/algif_aead.c
+++ b/
crypto/algif_aead.c
@@
-90,6
+90,7
@@
static void aead_put_sgl(struct sock *sk)
put_page(sg_page(sg + i));
sg_assign_page(sg + i, NULL);
}
put_page(sg_page(sg + i));
sg_assign_page(sg + i, NULL);
}
+ sg_init_table(sg, ALG_MAX_PAGES);
sgl->cur = 0;
ctx->used = 0;
ctx->more = 0;
sgl->cur = 0;
ctx->used = 0;
ctx->more = 0;
@@
-514,8
+515,7
@@
static struct proto_ops algif_aead_ops = {
static void *aead_bind(const char *name, u32 type, u32 mask)
{
static void *aead_bind(const char *name, u32 type, u32 mask)
{
- return crypto_alloc_aead(name, type | CRYPTO_ALG_AEAD_NEW,
- mask | CRYPTO_ALG_AEAD_NEW);
+ return crypto_alloc_aead(name, type, mask);
}
static void aead_release(void *private)
}
static void aead_release(void *private)
This page took
0.02544 seconds
and
5
git commands to generate.