Commit d1e4ba83 authored by Kees Cook's avatar Kees Cook Committed by Herbert Xu

crypto: qce - Remove VLA usage of skcipher

In the quest to remove all stack VLA usage from the kernel[1], this
replaces struct crypto_skcipher and SKCIPHER_REQUEST_ON_STACK() usage
with struct crypto_sync_skcipher and SYNC_SKCIPHER_REQUEST_ON_STACK(),
which uses a fixed stack size.

[1] https://lkml.kernel.org/r/CA+55aFzCG-zNmZwX4A2FQpadafLfEzK6CC=qPXydAacU1RqZWA@mail.gmail.com

Cc: Himanshu Jha <himanshujha199640@gmail.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent ba70152b
...@@ -189,7 +189,7 @@ static int qce_ablkcipher_setkey(struct crypto_ablkcipher *ablk, const u8 *key, ...@@ -189,7 +189,7 @@ static int qce_ablkcipher_setkey(struct crypto_ablkcipher *ablk, const u8 *key,
memcpy(ctx->enc_key, key, keylen); memcpy(ctx->enc_key, key, keylen);
return 0; return 0;
fallback: fallback:
ret = crypto_skcipher_setkey(ctx->fallback, key, keylen); ret = crypto_sync_skcipher_setkey(ctx->fallback, key, keylen);
if (!ret) if (!ret)
ctx->enc_keylen = keylen; ctx->enc_keylen = keylen;
return ret; return ret;
...@@ -212,9 +212,9 @@ static int qce_ablkcipher_crypt(struct ablkcipher_request *req, int encrypt) ...@@ -212,9 +212,9 @@ static int qce_ablkcipher_crypt(struct ablkcipher_request *req, int encrypt)
if (IS_AES(rctx->flags) && ctx->enc_keylen != AES_KEYSIZE_128 && if (IS_AES(rctx->flags) && ctx->enc_keylen != AES_KEYSIZE_128 &&
ctx->enc_keylen != AES_KEYSIZE_256) { ctx->enc_keylen != AES_KEYSIZE_256) {
SKCIPHER_REQUEST_ON_STACK(subreq, ctx->fallback); SYNC_SKCIPHER_REQUEST_ON_STACK(subreq, ctx->fallback);
skcipher_request_set_tfm(subreq, ctx->fallback); skcipher_request_set_sync_tfm(subreq, ctx->fallback);
skcipher_request_set_callback(subreq, req->base.flags, skcipher_request_set_callback(subreq, req->base.flags,
NULL, NULL); NULL, NULL);
skcipher_request_set_crypt(subreq, req->src, req->dst, skcipher_request_set_crypt(subreq, req->src, req->dst,
...@@ -245,9 +245,8 @@ static int qce_ablkcipher_init(struct crypto_tfm *tfm) ...@@ -245,9 +245,8 @@ static int qce_ablkcipher_init(struct crypto_tfm *tfm)
memset(ctx, 0, sizeof(*ctx)); memset(ctx, 0, sizeof(*ctx));
tfm->crt_ablkcipher.reqsize = sizeof(struct qce_cipher_reqctx); tfm->crt_ablkcipher.reqsize = sizeof(struct qce_cipher_reqctx);
ctx->fallback = crypto_alloc_skcipher(crypto_tfm_alg_name(tfm), 0, ctx->fallback = crypto_alloc_sync_skcipher(crypto_tfm_alg_name(tfm),
CRYPTO_ALG_ASYNC | 0, CRYPTO_ALG_NEED_FALLBACK);
CRYPTO_ALG_NEED_FALLBACK);
return PTR_ERR_OR_ZERO(ctx->fallback); return PTR_ERR_OR_ZERO(ctx->fallback);
} }
...@@ -255,7 +254,7 @@ static void qce_ablkcipher_exit(struct crypto_tfm *tfm) ...@@ -255,7 +254,7 @@ static void qce_ablkcipher_exit(struct crypto_tfm *tfm)
{ {
struct qce_cipher_ctx *ctx = crypto_tfm_ctx(tfm); struct qce_cipher_ctx *ctx = crypto_tfm_ctx(tfm);
crypto_free_skcipher(ctx->fallback); crypto_free_sync_skcipher(ctx->fallback);
} }
struct qce_ablkcipher_def { struct qce_ablkcipher_def {
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
struct qce_cipher_ctx { struct qce_cipher_ctx {
u8 enc_key[QCE_MAX_KEY_SIZE]; u8 enc_key[QCE_MAX_KEY_SIZE];
unsigned int enc_keylen; unsigned int enc_keylen;
struct crypto_skcipher *fallback; struct crypto_sync_skcipher *fallback;
}; };
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment