Skip to content

L
linux
Commit 5c525640 authored by Kees Cook's avatar Kees Cook Committed by Herbert Xu
Browse files
Options

crypto: vmx - 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: "Leonidas S. Barbosa" <leosilva@linux.vnet.ibm.com>
Cc: Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 7f28615d
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 29 deletions
drivers/crypto/vmx/aes_cbc.c
View file @ 5c525640
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "aesp8-ppc.h" #include "aesp8-ppc.h"
struct p8_aes_cbc_ctx { struct p8_aes_cbc_ctx {
struct crypto_skcipher *fallback; struct crypto_sync_skcipher *fallback;
struct aes_key enc_key; struct aes_key enc_key;
struct aes_key dec_key; struct aes_key dec_key;
}; };
...@@ -40,11 +40,11 @@ struct p8_aes_cbc_ctx { ...@@ -40,11 +40,11 @@ struct p8_aes_cbc_ctx {
static int p8_aes_cbc_init(struct crypto_tfm *tfm) static int p8_aes_cbc_init(struct crypto_tfm *tfm)
{ {
const char *alg = crypto_tfm_alg_name(tfm); const char *alg = crypto_tfm_alg_name(tfm);
struct crypto_skcipher *fallback; struct crypto_sync_skcipher *fallback;
struct p8_aes_cbc_ctx *ctx = crypto_tfm_ctx(tfm); struct p8_aes_cbc_ctx *ctx = crypto_tfm_ctx(tfm);
fallback = crypto_alloc_skcipher(alg, 0, fallback = crypto_alloc_sync_skcipher(alg, 0,
CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK); CRYPTO_ALG_NEED_FALLBACK);
if (IS_ERR(fallback)) { if (IS_ERR(fallback)) {
printk(KERN_ERR printk(KERN_ERR
...@@ -53,7 +53,7 @@ static int p8_aes_cbc_init(struct crypto_tfm *tfm) ...@@ -53,7 +53,7 @@ static int p8_aes_cbc_init(struct crypto_tfm *tfm)
return PTR_ERR(fallback); return PTR_ERR(fallback);
} }
crypto_skcipher_set_flags( crypto_sync_skcipher_set_flags(
fallback, fallback,
crypto_skcipher_get_flags((struct crypto_skcipher *)tfm)); crypto_skcipher_get_flags((struct crypto_skcipher *)tfm));
ctx->fallback = fallback; ctx->fallback = fallback;
...@@ -66,7 +66,7 @@ static void p8_aes_cbc_exit(struct crypto_tfm *tfm) ...@@ -66,7 +66,7 @@ static void p8_aes_cbc_exit(struct crypto_tfm *tfm)
struct p8_aes_cbc_ctx *ctx = crypto_tfm_ctx(tfm); struct p8_aes_cbc_ctx *ctx = crypto_tfm_ctx(tfm);
if (ctx->fallback) { if (ctx->fallback) {
crypto_free_skcipher(ctx->fallback); crypto_free_sync_skcipher(ctx->fallback);
ctx->fallback = NULL; ctx->fallback = NULL;
} }
} }
...@@ -86,7 +86,7 @@ static int p8_aes_cbc_setkey(struct crypto_tfm *tfm, const u8 *key, ...@@ -86,7 +86,7 @@ static int p8_aes_cbc_setkey(struct crypto_tfm *tfm, const u8 *key,
pagefault_enable(); pagefault_enable();
preempt_enable(); preempt_enable();
ret += crypto_skcipher_setkey(ctx->fallback, key, keylen); ret += crypto_sync_skcipher_setkey(ctx->fallback, key, keylen);
return ret; return ret;
} }
...@@ -100,8 +100,8 @@ static int p8_aes_cbc_encrypt(struct blkcipher_desc *desc, ...@@ -100,8 +100,8 @@ static int p8_aes_cbc_encrypt(struct blkcipher_desc *desc,
crypto_tfm_ctx(crypto_blkcipher_tfm(desc->tfm)); crypto_tfm_ctx(crypto_blkcipher_tfm(desc->tfm));
if (in_interrupt()) { if (in_interrupt()) {
SKCIPHER_REQUEST_ON_STACK(req, ctx->fallback); SYNC_SKCIPHER_REQUEST_ON_STACK(req, ctx->fallback);
skcipher_request_set_tfm(req, ctx->fallback); skcipher_request_set_sync_tfm(req, ctx->fallback);
skcipher_request_set_callback(req, desc->flags, NULL, NULL); skcipher_request_set_callback(req, desc->flags, NULL, NULL);
skcipher_request_set_crypt(req, src, dst, nbytes, desc->info); skcipher_request_set_crypt(req, src, dst, nbytes, desc->info);
ret = crypto_skcipher_encrypt(req); ret = crypto_skcipher_encrypt(req);
...@@ -139,8 +139,8 @@ static int p8_aes_cbc_decrypt(struct blkcipher_desc *desc, ...@@ -139,8 +139,8 @@ static int p8_aes_cbc_decrypt(struct blkcipher_desc *desc,
crypto_tfm_ctx(crypto_blkcipher_tfm(desc->tfm)); crypto_tfm_ctx(crypto_blkcipher_tfm(desc->tfm));
if (in_interrupt()) { if (in_interrupt()) {
SKCIPHER_REQUEST_ON_STACK(req, ctx->fallback); SYNC_SKCIPHER_REQUEST_ON_STACK(req, ctx->fallback);
skcipher_request_set_tfm(req, ctx->fallback); skcipher_request_set_sync_tfm(req, ctx->fallback);
skcipher_request_set_callback(req, desc->flags, NULL, NULL); skcipher_request_set_callback(req, desc->flags, NULL, NULL);
skcipher_request_set_crypt(req, src, dst, nbytes, desc->info); skcipher_request_set_crypt(req, src, dst, nbytes, desc->info);
ret = crypto_skcipher_decrypt(req); ret = crypto_skcipher_decrypt(req);
......
drivers/crypto/vmx/aes_ctr.c
View file @ 5c525640
...@@ -32,18 +32,18 @@ ...@@ -32,18 +32,18 @@
#include "aesp8-ppc.h" #include "aesp8-ppc.h"
struct p8_aes_ctr_ctx { struct p8_aes_ctr_ctx {
struct crypto_skcipher *fallback; struct crypto_sync_skcipher *fallback;
struct aes_key enc_key; struct aes_key enc_key;
}; };
static int p8_aes_ctr_init(struct crypto_tfm *tfm) static int p8_aes_ctr_init(struct crypto_tfm *tfm)
{ {
const char *alg = crypto_tfm_alg_name(tfm); const char *alg = crypto_tfm_alg_name(tfm);
struct crypto_skcipher *fallback; struct crypto_sync_skcipher *fallback;
struct p8_aes_ctr_ctx *ctx = crypto_tfm_ctx(tfm); struct p8_aes_ctr_ctx *ctx = crypto_tfm_ctx(tfm);
fallback = crypto_alloc_skcipher(alg, 0, fallback = crypto_alloc_sync_skcipher(alg, 0,
CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK); CRYPTO_ALG_NEED_FALLBACK);
if (IS_ERR(fallback)) { if (IS_ERR(fallback)) {
printk(KERN_ERR printk(KERN_ERR
"Failed to allocate transformation for '%s': %ld\n", "Failed to allocate transformation for '%s': %ld\n",
...@@ -51,7 +51,7 @@ static int p8_aes_ctr_init(struct crypto_tfm *tfm) ...@@ -51,7 +51,7 @@ static int p8_aes_ctr_init(struct crypto_tfm *tfm)
return PTR_ERR(fallback); return PTR_ERR(fallback);
} }
crypto_skcipher_set_flags( crypto_sync_skcipher_set_flags(
fallback, fallback,
crypto_skcipher_get_flags((struct crypto_skcipher *)tfm)); crypto_skcipher_get_flags((struct crypto_skcipher *)tfm));
ctx->fallback = fallback; ctx->fallback = fallback;
...@@ -64,7 +64,7 @@ static void p8_aes_ctr_exit(struct crypto_tfm *tfm) ...@@ -64,7 +64,7 @@ static void p8_aes_ctr_exit(struct crypto_tfm *tfm)
struct p8_aes_ctr_ctx *ctx = crypto_tfm_ctx(tfm); struct p8_aes_ctr_ctx *ctx = crypto_tfm_ctx(tfm);
if (ctx->fallback) { if (ctx->fallback) {
crypto_free_skcipher(ctx->fallback); crypto_free_sync_skcipher(ctx->fallback);
ctx->fallback = NULL; ctx->fallback = NULL;
} }
} }
...@@ -83,7 +83,7 @@ static int p8_aes_ctr_setkey(struct crypto_tfm *tfm, const u8 *key, ...@@ -83,7 +83,7 @@ static int p8_aes_ctr_setkey(struct crypto_tfm *tfm, const u8 *key,
pagefault_enable(); pagefault_enable();
preempt_enable(); preempt_enable();
ret += crypto_skcipher_setkey(ctx->fallback, key, keylen); ret += crypto_sync_skcipher_setkey(ctx->fallback, key, keylen);
return ret; return ret;
} }
...@@ -119,8 +119,8 @@ static int p8_aes_ctr_crypt(struct blkcipher_desc *desc, ...@@ -119,8 +119,8 @@ static int p8_aes_ctr_crypt(struct blkcipher_desc *desc,
crypto_tfm_ctx(crypto_blkcipher_tfm(desc->tfm)); crypto_tfm_ctx(crypto_blkcipher_tfm(desc->tfm));
if (in_interrupt()) { if (in_interrupt()) {
SKCIPHER_REQUEST_ON_STACK(req, ctx->fallback); SYNC_SKCIPHER_REQUEST_ON_STACK(req, ctx->fallback);
skcipher_request_set_tfm(req, ctx->fallback); skcipher_request_set_sync_tfm(req, ctx->fallback);
skcipher_request_set_callback(req, desc->flags, NULL, NULL); skcipher_request_set_callback(req, desc->flags, NULL, NULL);
skcipher_request_set_crypt(req, src, dst, nbytes, desc->info); skcipher_request_set_crypt(req, src, dst, nbytes, desc->info);
ret = crypto_skcipher_encrypt(req); ret = crypto_skcipher_encrypt(req);
......
drivers/crypto/vmx/aes_xts.c
View file @ 5c525640
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "aesp8-ppc.h" #include "aesp8-ppc.h"
struct p8_aes_xts_ctx { struct p8_aes_xts_ctx {
struct crypto_skcipher *fallback; struct crypto_sync_skcipher *fallback;
struct aes_key enc_key; struct aes_key enc_key;
struct aes_key dec_key; struct aes_key dec_key;
struct aes_key tweak_key; struct aes_key tweak_key;
...@@ -42,11 +42,11 @@ struct p8_aes_xts_ctx { ...@@ -42,11 +42,11 @@ struct p8_aes_xts_ctx {
static int p8_aes_xts_init(struct crypto_tfm *tfm) static int p8_aes_xts_init(struct crypto_tfm *tfm)
{ {
const char *alg = crypto_tfm_alg_name(tfm); const char *alg = crypto_tfm_alg_name(tfm);
struct crypto_skcipher *fallback; struct crypto_sync_skcipher *fallback;
struct p8_aes_xts_ctx *ctx = crypto_tfm_ctx(tfm); struct p8_aes_xts_ctx *ctx = crypto_tfm_ctx(tfm);
fallback = crypto_alloc_skcipher(alg, 0, fallback = crypto_alloc_sync_skcipher(alg, 0,
CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK); CRYPTO_ALG_NEED_FALLBACK);
if (IS_ERR(fallback)) { if (IS_ERR(fallback)) {
printk(KERN_ERR printk(KERN_ERR
"Failed to allocate transformation for '%s': %ld\n", "Failed to allocate transformation for '%s': %ld\n",
...@@ -54,7 +54,7 @@ static int p8_aes_xts_init(struct crypto_tfm *tfm) ...@@ -54,7 +54,7 @@ static int p8_aes_xts_init(struct crypto_tfm *tfm)
return PTR_ERR(fallback); return PTR_ERR(fallback);
} }
crypto_skcipher_set_flags( crypto_sync_skcipher_set_flags(
fallback, fallback,
crypto_skcipher_get_flags((struct crypto_skcipher *)tfm)); crypto_skcipher_get_flags((struct crypto_skcipher *)tfm));
ctx->fallback = fallback; ctx->fallback = fallback;
...@@ -67,7 +67,7 @@ static void p8_aes_xts_exit(struct crypto_tfm *tfm) ...@@ -67,7 +67,7 @@ static void p8_aes_xts_exit(struct crypto_tfm *tfm)
struct p8_aes_xts_ctx *ctx = crypto_tfm_ctx(tfm); struct p8_aes_xts_ctx *ctx = crypto_tfm_ctx(tfm);
if (ctx->fallback) { if (ctx->fallback) {
crypto_free_skcipher(ctx->fallback); crypto_free_sync_skcipher(ctx->fallback);
ctx->fallback = NULL; ctx->fallback = NULL;
} }
} }
...@@ -92,7 +92,7 @@ static int p8_aes_xts_setkey(struct crypto_tfm *tfm, const u8 *key, ...@@ -92,7 +92,7 @@ static int p8_aes_xts_setkey(struct crypto_tfm *tfm, const u8 *key,
pagefault_enable(); pagefault_enable();
preempt_enable(); preempt_enable();
ret += crypto_skcipher_setkey(ctx->fallback, key, keylen); ret += crypto_sync_skcipher_setkey(ctx->fallback, key, keylen);
return ret; return ret;
} }
...@@ -109,8 +109,8 @@ static int p8_aes_xts_crypt(struct blkcipher_desc *desc, ...@@ -109,8 +109,8 @@ static int p8_aes_xts_crypt(struct blkcipher_desc *desc,
crypto_tfm_ctx(crypto_blkcipher_tfm(desc->tfm)); crypto_tfm_ctx(crypto_blkcipher_tfm(desc->tfm));
if (in_interrupt()) { if (in_interrupt()) {
SKCIPHER_REQUEST_ON_STACK(req, ctx->fallback); SYNC_SKCIPHER_REQUEST_ON_STACK(req, ctx->fallback);
skcipher_request_set_tfm(req, ctx->fallback); skcipher_request_set_sync_tfm(req, ctx->fallback);
skcipher_request_set_callback(req, desc->flags, NULL, NULL); skcipher_request_set_callback(req, desc->flags, NULL, NULL);
skcipher_request_set_crypt(req, src, dst, nbytes, desc->info); skcipher_request_set_crypt(req, src, dst, nbytes, desc->info);
ret = enc? crypto_skcipher_encrypt(req) : crypto_skcipher_decrypt(req); ret = enc? crypto_skcipher_encrypt(req) : crypto_skcipher_decrypt(req);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7