crypto: cavium - remove bogus code handling cryptd (0edf8593) · Commits · 戴 / test

The cavium crypto driver adds 'sizeof(struct ablkcipher_request)' to its request size because "the cryptd daemon uses this memory for request_ctx information". This is incorrect and unnecessary; cryptd doesn't require wrapped algorithms to reserve extra request space. So remove this. Also remove the unneeded memset() of the tfm context to 0. It's already zeroed on allocation. Signed-off-by:

Eric Biggers <ebiggers@google.com> Signed-off-by:

Herbert Xu <herbert@gondor.apana.org.au>

drivers/crypto/cavium/cpt/cptvf_algs.c

+1 −11

Original line number	Diff line number	Diff line
		@@ -10,7 +10,6 @@
		#include <crypto/aes.h>
		#include <crypto/algapi.h>
		#include <crypto/authenc.h>
		#include <crypto/cryptd.h>
		#include <crypto/crypto_wq.h>
		#include <crypto/des.h>
		#include <crypto/xts.h>
		@@ -356,16 +355,7 @@ static int cvm_ecb_des3_setkey(struct crypto_ablkcipher cipher, const u8 key,

		static int cvm_enc_dec_init(struct crypto_tfm *tfm)
		{
		struct cvm_enc_ctx *ctx = crypto_tfm_ctx(tfm);

		memset(ctx, 0, sizeof(*ctx));
		tfm->crt_ablkcipher.reqsize = sizeof(struct cvm_req_ctx) +
		sizeof(struct ablkcipher_request);
		/* Additional memory for ablkcipher_request is
		* allocated since the cryptd daemon uses
		* this memory for request_ctx information
		*/

		tfm->crt_ablkcipher.reqsize = sizeof(struct cvm_req_ctx);
		return 0;
		}

Admin message