Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4d8c23e authored by Herbert Xu's avatar Herbert Xu Committed by Greg Kroah-Hartman
Browse files

crypto: rsa-pkcs1pad - Use akcipher_request_complete 



[ Upstream commit 564cabc0ca0bdfa8f0fc1ae74b24d0a7554522c5 ]

Use the akcipher_request_complete helper instead of calling the
completion function directly.  In fact the previous code was buggy
in that EINPROGRESS was never passed back to the original caller.

Fixes: 3d5b1ecd ("crypto: rsa - RSA padding algorithm")
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8c144749

crypto/rsa-pkcs1pad.c

+15 −19
Original line number Diff line number Diff line
@@ -213,16 +213,14 @@ static void pkcs1pad_encrypt_sign_complete_cb( 
		struct crypto_async_request *child_async_req, int err)

{

	struct akcipher_request *req = child_async_req->data;

	struct crypto_async_request async_req;



	if (err == -EINPROGRESS)

		return;

		goto out;



	err = pkcs1pad_encrypt_sign_complete(req, err);



	async_req.data = req->base.data;

	async_req.tfm = crypto_akcipher_tfm(crypto_akcipher_reqtfm(req));

	async_req.flags = child_async_req->flags;

	req->base.complete(&async_req,

			pkcs1pad_encrypt_sign_complete(req, err));

out:

	akcipher_request_complete(req, err);

}



static int pkcs1pad_encrypt(struct akcipher_request *req)
@@ -331,15 +329,14 @@ static void pkcs1pad_decrypt_complete_cb( 
		struct crypto_async_request *child_async_req, int err)

{

	struct akcipher_request *req = child_async_req->data;

	struct crypto_async_request async_req;



	if (err == -EINPROGRESS)

		return;

		goto out;



	err = pkcs1pad_decrypt_complete(req, err);



	async_req.data = req->base.data;

	async_req.tfm = crypto_akcipher_tfm(crypto_akcipher_reqtfm(req));

	async_req.flags = child_async_req->flags;

	req->base.complete(&async_req, pkcs1pad_decrypt_complete(req, err));

out:

	akcipher_request_complete(req, err);

}



static int pkcs1pad_decrypt(struct akcipher_request *req)
@@ -511,15 +508,14 @@ static void pkcs1pad_verify_complete_cb( 
		struct crypto_async_request *child_async_req, int err)

{

	struct akcipher_request *req = child_async_req->data;

	struct crypto_async_request async_req;



	if (err == -EINPROGRESS)

		return;

		goto out;



	async_req.data = req->base.data;

	async_req.tfm = crypto_akcipher_tfm(crypto_akcipher_reqtfm(req));

	async_req.flags = child_async_req->flags;

	req->base.complete(&async_req, pkcs1pad_verify_complete(req, err));

	err = pkcs1pad_verify_complete(req, err);



out:

	akcipher_request_complete(req, err);

}



/*