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

Commit 4e5b0ad5 authored by Gilad Ben-Yossef's avatar Gilad Ben-Yossef Committed by Herbert Xu
Browse files

crypto: remove redundant backlog checks on EBUSY 



Now that -EBUSY return code only indicates backlog queueing
we can safely remove the now redundant check for the
CRYPTO_TFM_REQ_MAY_BACKLOG flag when -EBUSY is returned.

Signed-off-by: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 068c2e70

crypto/ahash.c

+3 −9
Original line number Diff line number Diff line
@@ -334,9 +334,7 @@ static int ahash_op_unaligned(struct ahash_request *req, 
		return err;



	err = op(req);

	if (err == -EINPROGRESS ||

	    (err == -EBUSY && (ahash_request_flags(req) &

			       CRYPTO_TFM_REQ_MAY_BACKLOG)))

	if (err == -EINPROGRESS || err == -EBUSY)

		return err;



	ahash_restore_req(req, err);
@@ -394,9 +392,7 @@ static int ahash_def_finup_finish1(struct ahash_request *req, int err) 
	req->base.complete = ahash_def_finup_done2;



	err = crypto_ahash_reqtfm(req)->final(req);

	if (err == -EINPROGRESS ||

	    (err == -EBUSY && (ahash_request_flags(req) &

			       CRYPTO_TFM_REQ_MAY_BACKLOG)))

	if (err == -EINPROGRESS || err == -EBUSY)

		return err;



out:
@@ -432,9 +428,7 @@ static int ahash_def_finup(struct ahash_request *req) 
		return err;



	err = tfm->update(req);

	if (err == -EINPROGRESS ||

	    (err == -EBUSY && (ahash_request_flags(req) &

			       CRYPTO_TFM_REQ_MAY_BACKLOG)))

	if (err == -EINPROGRESS || err == -EBUSY)

		return err;



	return ahash_def_finup_finish1(req, err);

crypto/cts.c

+2 −4
Original line number Diff line number Diff line
@@ -136,8 +136,7 @@ static void crypto_cts_encrypt_done(struct crypto_async_request *areq, int err) 
		goto out;



	err = cts_cbc_encrypt(req);

	if (err == -EINPROGRESS ||

	    (err == -EBUSY && req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG))

	if (err == -EINPROGRESS || err == -EBUSY)

		return;



out:
@@ -229,8 +228,7 @@ static void crypto_cts_decrypt_done(struct crypto_async_request *areq, int err) 
		goto out;



	err = cts_cbc_decrypt(req);

	if (err == -EINPROGRESS ||

	    (err == -EBUSY && req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG))

	if (err == -EINPROGRESS || err == -EBUSY)

		return;



out:

crypto/lrw.c

+2 −6
Original line number Diff line number Diff line
@@ -328,9 +328,7 @@ static int do_encrypt(struct skcipher_request *req, int err) 
		      crypto_skcipher_encrypt(subreq) ?:

		      post_crypt(req);



		if (err == -EINPROGRESS ||

		    (err == -EBUSY &&

		     req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG))

		if (err == -EINPROGRESS || err == -EBUSY)

			return err;

	}
@@ -380,9 +378,7 @@ static int do_decrypt(struct skcipher_request *req, int err) 
		      crypto_skcipher_decrypt(subreq) ?:

		      post_crypt(req);



		if (err == -EINPROGRESS ||

		    (err == -EBUSY &&

		     req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG))

		if (err == -EINPROGRESS || err == -EBUSY)

			return err;

	}

crypto/rsa-pkcs1pad.c

+4 −12
Original line number Diff line number Diff line
@@ -279,9 +279,7 @@ static int pkcs1pad_encrypt(struct akcipher_request *req) 
				   req->dst, ctx->key_size - 1, req->dst_len);



	err = crypto_akcipher_encrypt(&req_ctx->child_req);

	if (err != -EINPROGRESS &&

			(err != -EBUSY ||

			 !(req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)))

	if (err != -EINPROGRESS && err != -EBUSY)

		return pkcs1pad_encrypt_sign_complete(req, err);



	return err;
@@ -383,9 +381,7 @@ static int pkcs1pad_decrypt(struct akcipher_request *req) 
				   ctx->key_size);



	err = crypto_akcipher_decrypt(&req_ctx->child_req);

	if (err != -EINPROGRESS &&

			(err != -EBUSY ||

			 !(req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)))

	if (err != -EINPROGRESS && err != -EBUSY)

		return pkcs1pad_decrypt_complete(req, err);



	return err;
@@ -440,9 +436,7 @@ static int pkcs1pad_sign(struct akcipher_request *req) 
				   req->dst, ctx->key_size - 1, req->dst_len);



	err = crypto_akcipher_sign(&req_ctx->child_req);

	if (err != -EINPROGRESS &&

			(err != -EBUSY ||

			 !(req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)))

	if (err != -EINPROGRESS && err != -EBUSY)

		return pkcs1pad_encrypt_sign_complete(req, err);



	return err;
@@ -561,9 +555,7 @@ static int pkcs1pad_verify(struct akcipher_request *req) 
				   ctx->key_size);



	err = crypto_akcipher_verify(&req_ctx->child_req);

	if (err != -EINPROGRESS &&

			(err != -EBUSY ||

			 !(req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)))

	if (err != -EINPROGRESS && err != -EBUSY)

		return pkcs1pad_verify_complete(req, err);



	return err;

crypto/xts.c

+2 −6
Original line number Diff line number Diff line
@@ -269,9 +269,7 @@ static int do_encrypt(struct skcipher_request *req, int err) 
		      crypto_skcipher_encrypt(subreq) ?:

		      post_crypt(req);



		if (err == -EINPROGRESS ||

		    (err == -EBUSY &&

		     req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG))

		if (err == -EINPROGRESS || err == -EBUSY)

			return err;

	}
@@ -321,9 +319,7 @@ static int do_decrypt(struct skcipher_request *req, int err) 
		      crypto_skcipher_decrypt(subreq) ?:

		      post_crypt(req);



		if (err == -EINPROGRESS ||

		    (err == -EBUSY &&

		     req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG))

		if (err == -EINPROGRESS || err == -EBUSY)

			return err;

	}