diff options
author | Jonathan Corbet <corbet@lwn.net> | 2017-03-07 00:22:51 -0700 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2017-03-07 00:22:51 -0700 |
commit | 07d045372921bfaa843ea00749c150b099ca0a49 (patch) | |
tree | f849e8432047d3e0fc04590ddfb6a76ba953f9b6 /crypto/algif_aead.c | |
parent | 1bd9a34ffdd5f22ef74ed68b5d8b6fb4b781d58c (diff) | |
parent | 4c6427919ee920d5963cf826de76292286342aa0 (diff) | |
download | linux-crypto-07d045372921bfaa843ea00749c150b099ca0a49.tar.gz linux-crypto-07d045372921bfaa843ea00749c150b099ca0a49.zip |
Merge tag 'v4.11-rc1' into docs-next
Linux 4.11-rc1
Diffstat (limited to '')
-rw-r--r-- | crypto/algif_aead.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c index f849311e..5a805375 100644 --- a/crypto/algif_aead.c +++ b/crypto/algif_aead.c @@ -19,6 +19,7 @@ #include <linux/init.h> #include <linux/list.h> #include <linux/kernel.h> +#include <linux/sched/signal.h> #include <linux/mm.h> #include <linux/module.h> #include <linux/net.h> @@ -661,9 +662,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); |