summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2017-02-03 18:14:10 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2017-02-03 18:14:10 +0800
commit34cb58213948a0c26a228da903a3b37c2505843c (patch)
tree21970a3387c406654a13774b9ffab36744cea8ea /crypto
parent7dede913fc2ab9c0d3bff3a49e26fa9e858b0c13 (diff)
parent7c2cf1c4615cc2f576d0604406cdf0065f00b83b (diff)
downloadlinux-stable-34cb58213948a0c26a228da903a3b37c2505843c.tar.gz
linux-stable-34cb58213948a0c26a228da903a3b37c2505843c.tar.bz2
linux-stable-34cb58213948a0c26a228da903a3b37c2505843c.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.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/algapi.c1
-rw-r--r--crypto/algif_aead.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/crypto/algapi.c b/crypto/algapi.c
index df939b54b09f..1fad2a6b3bbb 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 f849311e9fd4..533265f110e0 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);