3 files changed, 8 insertions, 4 deletions

diff --git a/crypto/authenc.c b/crypto/authenc.c
index ed8ac5a6fa5f..4b226768752a 100644
--- a/crypto/authenc.c
+++ b/crypto/authenc.c
@@ -217,9 +217,10 @@ static void crypto_authenc_givencrypt_done(struct crypto_async_request *req,
                                            int err)
 {
         if (!err) {
-                struct aead_givcrypt_request *greq = req->data;
+                struct aead_request *areq = req->data;
+                struct skcipher_givcrypt_request *greq = aead_request_ctx(areq);
 
-                err = crypto_authenc_genicv(&greq->areq, greq->giv, 0);
+                err = crypto_authenc_genicv(areq, greq->giv, 0);
         }
 
         aead_request_complete(req->data, err);
diff --git a/crypto/cryptd.c b/crypto/cryptd.c
index 250425263e00..b150de562057 100644
--- a/crypto/cryptd.c
+++ b/crypto/cryptd.c
@@ -190,8 +190,10 @@ static struct crypto_instance *cryptd_alloc_instance(struct crypto_alg *alg,
         int err;
 
         inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL);
-        if (IS_ERR(inst))
+        if (!inst) {
+                inst = ERR_PTR(-ENOMEM);
                 goto out;
+        }
 
         err = -ENAMETOOLONG;
         if (snprintf(inst->alg.cra_driver_name, CRYPTO_MAX_ALG_NAME,
diff --git a/crypto/eseqiv.c b/crypto/eseqiv.c
index b14f14e314b6..881d30910434 100644
--- a/crypto/eseqiv.c
+++ b/crypto/eseqiv.c
@@ -136,7 +136,8 @@ static int eseqiv_givencrypt(struct skcipher_givcrypt_request *req)
         }
 
         ablkcipher_request_set_crypt(subreq, reqctx->src, dst,
-                                     req->creq.nbytes, req->creq.info);
+                                     req->creq.nbytes + ivsize,
+                                     req->creq.info);
 
         memcpy(req->creq.info, ctx->salt, ivsize);