diff options
| author |  Taehee Yoo <ap420073@gmail.com>
| 2023-01-01 09:12:50 +0000 |
|---|---|---|
| committer |  Herbert Xu <herbert@gondor.apana.org.au>
| 2023-01-06 17:15:47 +0800 |
| commit | 35344cf30f2b080f75b4097eebcd7567e54bce22 (patch) | |
| tree | 19105b49700509825512761828e9eae2998598b7 /arch/x86/kernel/asm-offsets.c | |
| parent | crypto: x86/aria - add keystream array into request ctx (diff) | |
| download | linux-35344cf30f2b080f75b4097eebcd7567e54bce22.tar.gz linux-35344cf30f2b080f75b4097eebcd7567e54bce22.tar.bz2 linux-35344cf30f2b080f75b4097eebcd7567e54bce22.zip | |
crypto: x86/aria - do not use magic number offsets of aria_ctx
aria-avx assembly code accesses members of aria_ctx with magic number
offset. If the shape of struct aria_ctx is changed carelessly,
aria-avx will not work.
So, we need to ensure accessing members of aria_ctx with correct
offset values, not with magic numbers.
It adds ARIA_CTX_enc_key, ARIA_CTX_dec_key, and ARIA_CTX_rounds in the
asm-offsets.c So, correct offset definitions will be generated.
aria-avx assembly code can access members of aria_ctx safely with
these definitions.
Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/x86/kernel/asm-offsets.c')
| -rw-r--r-- | arch/x86/kernel/asm-offsets.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c index 82c783da16a8..ef9e951415c5 100644 --- a/arch/x86/kernel/asm-offsets.c +++ b/arch/x86/kernel/asm-offsets.c @@ -7,6 +7,7 @@ #define COMPILE_OFFSETS #include <linux/crypto.h> +#include <crypto/aria.h> #include <linux/sched.h> #include <linux/stddef.h> #include <linux/hardirq.h> @@ -111,5 +112,12 @@ static void __used common(void) #ifdef CONFIG_CALL_DEPTH_TRACKING OFFSET(X86_call_depth, pcpu_hot, call_depth); #endif +#if IS_ENABLED(CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64) + /* Offset for fields in aria_ctx */ + BLANK(); + OFFSET(ARIA_CTX_enc_key, aria_ctx, enc_key); + OFFSET(ARIA_CTX_dec_key, aria_ctx, dec_key); + OFFSET(ARIA_CTX_rounds, aria_ctx, rounds); +#endif } |