Commit 32f34bf7 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu

crypto: x86/sha1 - fix possible crash with CFI enabled

sha1_transform_ssse3(), sha1_transform_avx(), and sha1_ni_transform()
(but not sha1_transform_avx2()) are called via indirect function calls.
Therefore they need to use SYM_TYPED_FUNC_START instead of
SYM_FUNC_START to cause their type hashes to be emitted when the kernel
is built with CONFIG_CFI_CLANG=y.  Otherwise, the code crashes with a
CFI failure (if the compiler didn't happen to optimize out the indirect
calls).

Fixes: ccace936 ("x86: Add types to indirectly called assembly functions")
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarSami Tolvanen <samitolvanen@google.com>
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 0f8bc4bd
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/cfi_types.h>
#define DIGEST_PTR %rdi /* 1st arg */ #define DIGEST_PTR %rdi /* 1st arg */
#define DATA_PTR %rsi /* 2nd arg */ #define DATA_PTR %rsi /* 2nd arg */
...@@ -93,7 +94,7 @@ ...@@ -93,7 +94,7 @@
*/ */
.text .text
.align 32 .align 32
SYM_FUNC_START(sha1_ni_transform) SYM_TYPED_FUNC_START(sha1_ni_transform)
push %rbp push %rbp
mov %rsp, %rbp mov %rsp, %rbp
sub $FRAME_SIZE, %rsp sub $FRAME_SIZE, %rsp
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/cfi_types.h>
#define CTX %rdi // arg1 #define CTX %rdi // arg1
#define BUF %rsi // arg2 #define BUF %rsi // arg2
...@@ -67,7 +68,7 @@ ...@@ -67,7 +68,7 @@
* param: function's name * param: function's name
*/ */
.macro SHA1_VECTOR_ASM name .macro SHA1_VECTOR_ASM name
SYM_FUNC_START(\name) SYM_TYPED_FUNC_START(\name)
push %rbx push %rbx
push %r12 push %r12
......
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