Commit 736f8868 authored by Tianjia Zhang's avatar Tianjia Zhang Committed by Herbert Xu
Browse files

crypto: arm64/sm4 - fix possible crash with CFI enabled 



The SM4 CCM/GCM assembly functions for encryption and decryption is
called via indirect function calls.  Therefore they need to use
SYM_TYPED_FUNC_START instead of SYM_FUNC_START to cause its type hash
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 call).

Fixes: 67fa3a7f ("crypto: arm64/sm4 - add CE implementation for CCM mode")
Fixes: ae1b83c7 ("crypto: arm64/sm4 - add CE implementation for GCM mode")
Signed-off-by: default avatarTianjia Zhang <tianjia.zhang@linux.alibaba.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent a2352998

arch/arm64/crypto/sm4-ce-ccm-core.S

+3 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */



#include <linux/linkage.h>

#include <linux/cfi_types.h>

#include <asm/assembler.h>

#include "sm4-ce-asm.h"
@@ -104,7 +105,7 @@ SYM_FUNC_START(sm4_ce_ccm_final) 
SYM_FUNC_END(sm4_ce_ccm_final)



.align 3

SYM_FUNC_START(sm4_ce_ccm_enc)

SYM_TYPED_FUNC_START(sm4_ce_ccm_enc)

	/* input:

	 *   x0: round key array, CTX

	 *   x1: dst
@@ -216,7 +217,7 @@ SYM_FUNC_START(sm4_ce_ccm_enc) 
SYM_FUNC_END(sm4_ce_ccm_enc)



.align 3

SYM_FUNC_START(sm4_ce_ccm_dec)

SYM_TYPED_FUNC_START(sm4_ce_ccm_dec)

	/* input:

	 *   x0: round key array, CTX

	 *   x1: dst

arch/arm64/crypto/sm4-ce-gcm-core.S

+3 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */



#include <linux/linkage.h>

#include <linux/cfi_types.h>

#include <asm/assembler.h>

#include "sm4-ce-asm.h"
@@ -370,7 +371,7 @@ SYM_FUNC_START(pmull_ghash_update) 
SYM_FUNC_END(pmull_ghash_update)



.align 3

SYM_FUNC_START(sm4_ce_pmull_gcm_enc)

SYM_TYPED_FUNC_START(sm4_ce_pmull_gcm_enc)

	/* input:

	 *   x0: round key array, CTX

	 *   x1: dst
@@ -581,7 +582,7 @@ SYM_FUNC_END(sm4_ce_pmull_gcm_enc) 
#define	RH3	v20



.align 3

SYM_FUNC_START(sm4_ce_pmull_gcm_dec)

SYM_TYPED_FUNC_START(sm4_ce_pmull_gcm_dec)

	/* input:

	 *   x0: round key array, CTX

	 *   x1: dst