| Message ID | 20190413042531.16231-1-ebiggers@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | crypto: cavium - remove bogus code handling cryptd | expand |
On Fri, Apr 12, 2019 at 09:25:31PM -0700, Eric Biggers wrote: > From: Eric Biggers <ebiggers@google.com> > > 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> > --- > drivers/crypto/cavium/cpt/cptvf_algs.c | 12 +----------- > 1 file changed, 1 insertion(+), 11 deletions(-) Patch applied. Thanks.
diff --git a/drivers/crypto/cavium/cpt/cptvf_algs.c b/drivers/crypto/cavium/cpt/cptvf_algs.c index 600336d169a9e..8d53611e9d5db 100644 --- a/drivers/crypto/cavium/cpt/cptvf_algs.c +++ b/drivers/crypto/cavium/cpt/cptvf_algs.c @@ -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> @@ -338,16 +337,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; }