Commit 180ce7e8 authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: authenc - Add EINPROGRESS check 



When Steffen originally wrote the authenc async hash patch, he
correctly had EINPROGRESS checks in place so that we did not invoke
the original completion handler with it.

Unfortuantely I told him to remove it before the patch was applied.

As only MAY_BACKLOG request completion handlers are required to
handle EINPROGRESS completions, those checks are really needed.

This patch restores them.

Reported-by: default avatarSebastian Andrzej Siewior <sebastian@breakpoint.cc>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 74781387

crypto/authenc.c

+11 −5
Original line number Diff line number Diff line
@@ -46,6 +46,12 @@ struct authenc_request_ctx { 
	char tail[];

};



static void authenc_request_complete(struct aead_request *req, int err)

{

	if (err != -EINPROGRESS)

		aead_request_complete(req, err);

}



static int crypto_authenc_setkey(struct crypto_aead *authenc, const u8 *key,

				 unsigned int keylen)

{
@@ -142,7 +148,7 @@ static void authenc_geniv_ahash_update_done(struct crypto_async_request *areq, 
				 crypto_aead_authsize(authenc), 1);



out:

	aead_request_complete(req, err);

	authenc_request_complete(req, err);

}



static void authenc_geniv_ahash_done(struct crypto_async_request *areq, int err)
@@ -208,7 +214,7 @@ static void authenc_verify_ahash_update_done(struct crypto_async_request *areq, 
	err = crypto_ablkcipher_decrypt(abreq);



out:

	aead_request_complete(req, err);

	authenc_request_complete(req, err);

}



static void authenc_verify_ahash_done(struct crypto_async_request *areq,
@@ -245,7 +251,7 @@ static void authenc_verify_ahash_done(struct crypto_async_request *areq, 
	err = crypto_ablkcipher_decrypt(abreq);



out:

	aead_request_complete(req, err);

	authenc_request_complete(req, err);

}



static u8 *crypto_authenc_ahash_fb(struct aead_request *req, unsigned int flags)
@@ -379,7 +385,7 @@ static void crypto_authenc_encrypt_done(struct crypto_async_request *req, 
		err = crypto_authenc_genicv(areq, iv, 0);

	}



	aead_request_complete(areq, err);

	authenc_request_complete(areq, err);

}



static int crypto_authenc_encrypt(struct aead_request *req)
@@ -420,7 +426,7 @@ static void crypto_authenc_givencrypt_done(struct crypto_async_request *req, 
		err = crypto_authenc_genicv(areq, greq->giv, 0);

	}



	aead_request_complete(areq, err);

	authenc_request_complete(areq, err);

}



static int crypto_authenc_givencrypt(struct aead_givcrypt_request *req)