Skip to content

Commit

Permalink
crypto: x86/sha1 - fix possible crash with CFI enabled
Browse files Browse the repository at this point in the history
[ Upstream commit 32f34bf ]

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: ccace93 ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
ebiggers authored and gregkh committed Dec 31, 2022
1 parent 8d447b9 commit f3b1021
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion arch/x86/crypto/sha1_ni_asm.S
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
*/

#include <linux/linkage.h>
#include <linux/cfi_types.h>

#define DIGEST_PTR %rdi /* 1st arg */
#define DATA_PTR %rsi /* 2nd arg */
Expand Down Expand Up @@ -93,7 +94,7 @@
*/
.text
.align 32
SYM_FUNC_START(sha1_ni_transform)
SYM_TYPED_FUNC_START(sha1_ni_transform)
push %rbp
mov %rsp, %rbp
sub $FRAME_SIZE, %rsp
Expand Down
3 changes: 2 additions & 1 deletion arch/x86/crypto/sha1_ssse3_asm.S
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
*/

#include <linux/linkage.h>
#include <linux/cfi_types.h>

#define CTX %rdi // arg1
#define BUF %rsi // arg2
Expand Down Expand Up @@ -67,7 +68,7 @@
* param: function's name
*/
.macro SHA1_VECTOR_ASM name
SYM_FUNC_START(\name)
SYM_TYPED_FUNC_START(\name)

push %rbx
push %r12
Expand Down

0 comments on commit f3b1021

Please sign in to comment.