ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-24 05:01:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: ccace936ee ("x86: Add types to indirectly called assembly functions")
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Eric Biggers
2022-11-18 11:44:13 -08:00
committed by Herbert Xu
parent 0f8bc4bd48
commit 32f34bf7e4
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/crypto/sha1_ni_asm.S
View File

@@ -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 @@
*/ */
.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

3
arch/x86/crypto/sha1_ssse3_asm.S
View File

@@ -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 @@
* 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