Merge tag 'asoc-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v4.12

A quiet release for the core, but lots of new drivers this time around:

 - A new, generalized, API for hooking up jacks which makes it easier to
   write generic machine drivers for simple cases.
 - Continuing fixes for issues with the x86 CPU drivers.
 - New drivers for Cirrus CS35L35, DIO DIO2125, Everest ES7132,
   HiSilicon hi6210, Maxim MAX98927, MT2701 systems with WM8960, Nuvoton
   NAU8824, Odroid systems, ST STM32 SAI controllers and x86 systems with
   DA7213

1 files changed, 6 insertions, 6 deletions

diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c
index 5a8053758657..ef59d9926ee9 100644
--- a/crypto/algif_aead.c
+++ b/crypto/algif_aead.c
@@ -40,6 +40,7 @@ struct aead_async_req {
         struct aead_async_rsgl first_rsgl;
         struct list_head list;
         struct kiocb *iocb;
+        struct sock *sk;
         unsigned int tsgls;
         char iv[];
 };
@@ -379,12 +380,10 @@ unlock:
 
 static void aead_async_cb(struct crypto_async_request *_req, int err)
 {
-        struct sock *sk = _req->data;
-        struct alg_sock *ask = alg_sk(sk);
-        struct aead_ctx *ctx = ask->private;
-        struct crypto_aead *tfm = crypto_aead_reqtfm(&ctx->aead_req);
-        struct aead_request *req = aead_request_cast(_req);
+        struct aead_request *req = _req->data;
+        struct crypto_aead *tfm = crypto_aead_reqtfm(req);
         struct aead_async_req *areq = GET_ASYM_REQ(req, tfm);
+        struct sock *sk = areq->sk;
         struct scatterlist *sg = areq->tsgl;
         struct aead_async_rsgl *rsgl;
         struct kiocb *iocb = areq->iocb;
@@ -447,11 +446,12 @@ static int aead_recvmsg_async(struct socket *sock, struct msghdr *msg,
         memset(&areq->first_rsgl, '\0', sizeof(areq->first_rsgl));
         INIT_LIST_HEAD(&areq->list);
         areq->iocb = msg->msg_iocb;
+        areq->sk = sk;
         memcpy(areq->iv, ctx->iv, crypto_aead_ivsize(tfm));
         aead_request_set_tfm(req, tfm);
         aead_request_set_ad(req, ctx->aead_assoclen);
         aead_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,
-                                  aead_async_cb, sk);
+                                  aead_async_cb, req);
         used -= ctx->aead_assoclen;
 
         /* take over all tx sgls from ctx */