diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2017-02-03 18:14:10 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-02-03 18:14:10 +0800 |
| commit | 53a80d54383ff98efadbfee75032a8370ac7bd0b (patch) | |
| tree | f16bb72061f4e203570eed1ee0560560f065f0e2 | |
| parent | 76c28e1b1d4c849638e307239e7c43d67f0a3197 (diff) | |
| parent | 108b5beb5d963af51f9035856c9be57c1fbbbe14 (diff) | |
| download | linux-crypto-53a80d54383ff98efadbfee75032a8370ac7bd0b.tar.gz linux-crypto-53a80d54383ff98efadbfee75032a8370ac7bd0b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to pick up arm64 output IV patch.
| -rw-r--r-- | crypto/algapi.c | 1 | ||||
| -rw-r--r-- | crypto/algif_aead.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/crypto/algapi.c b/crypto/algapi.c index df939b54..1fad2a6b 100644 --- a/crypto/algapi.c +++ b/crypto/algapi.c @@ -356,6 +356,7 @@ int crypto_register_alg(struct crypto_alg *alg) struct crypto_larval *larval; int err; + alg->cra_flags &= ~CRYPTO_ALG_DEAD; err = crypto_check_alg(alg); if (err) return err; diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c index f849311e..533265f1 100644 --- a/crypto/algif_aead.c +++ b/crypto/algif_aead.c @@ -661,9 +661,9 @@ static int aead_recvmsg_sync(struct socket *sock, struct msghdr *msg, int flags) unlock: list_for_each_entry_safe(rsgl, tmp, &ctx->list, list) { af_alg_free_sg(&rsgl->sgl); + list_del(&rsgl->list); if (rsgl != &ctx->first_rsgl) sock_kfree_s(sk, rsgl, sizeof(*rsgl)); - list_del(&rsgl->list); } INIT_LIST_HEAD(&ctx->list); aead_wmem_wakeup(sk); |