root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

x86_64: Add endbranch at function entries for Intel CET 

To support Intel CET, all indirect branch targets must start with
endbranch.  Here is a patch to add endbranch to function entries
in x86_64 assembly codes which are indirect branch targets as
discovered by running openssl testsuite on Intel CET machine and
visual inspection.

Verified with

$ CC="gcc -Wl,-z,cet-report=error" ./Configure shared linux-x86_64 -fcf-protection
$ make
$ make test

and

$ CC="gcc -mx32 -Wl,-z,cet-report=error" ./Configure shared linux-x32 -fcf-protection
$ make
$ make test # <<< passed with https://github.com/openssl/openssl/pull/10988

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10982)
This commit is contained in:
H.J. Lu 2020-01-31 04:17:26 -08:00 committed by Richard Levitte
parent 07980622e2
commit 98ad3fe82b
9 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crypto/aes/asm/aes-x86_64.pl
View File

@ -606,6 +606,7 @@ $code.=<<___;
asm_AES_encrypt: asm_AES_encrypt:
AES_encrypt: AES_encrypt:
.cfi_startproc .cfi_startproc
endbranch
mov %rsp,%rax mov %rsp,%rax
.cfi_def_cfa_register %rax .cfi_def_cfa_register %rax
push %rbx push %rbx
@ -1226,6 +1227,7 @@ $code.=<<___;
asm_AES_decrypt: asm_AES_decrypt:
AES_decrypt: AES_decrypt:
.cfi_startproc .cfi_startproc
endbranch
mov %rsp,%rax mov %rsp,%rax
.cfi_def_cfa_register %rax .cfi_def_cfa_register %rax
push %rbx push %rbx
@ -1343,6 +1345,7 @@ $code.=<<___;
.align 16 .align 16
AES_set_encrypt_key: AES_set_encrypt_key:
.cfi_startproc .cfi_startproc
endbranch
push %rbx push %rbx
.cfi_push %rbx .cfi_push %rbx
push %rbp push %rbp
@ -1623,6 +1626,7 @@ $code.=<<___;
.align 16 .align 16
AES_set_decrypt_key: AES_set_decrypt_key:
.cfi_startproc .cfi_startproc
endbranch
push %rbx push %rbx
.cfi_push %rbx .cfi_push %rbx
push %rbp push %rbp
@ -1737,6 +1741,7 @@ $code.=<<___;
asm_AES_cbc_encrypt: asm_AES_cbc_encrypt:
AES_cbc_encrypt: AES_cbc_encrypt:
.cfi_startproc .cfi_startproc
endbranch
cmp \$0,%rdx # check length cmp \$0,%rdx # check length
je .Lcbc_epilogue je .Lcbc_epilogue
pushfq pushfq

11
crypto/aes/asm/aesni-x86_64.pl
View File

@ -277,6 +277,7 @@ $code.=<<___;
.align 16 .align 16
${PREFIX}_encrypt: ${PREFIX}_encrypt:
.cfi_startproc .cfi_startproc
endbranch
movups ($inp),$inout0 # load input movups ($inp),$inout0 # load input
mov 240($key),$rounds # key->rounds mov 240($key),$rounds # key->rounds
___ ___
@ -295,6 +296,7 @@ $code.=<<___;
.align 16 .align 16
${PREFIX}_decrypt: ${PREFIX}_decrypt:
.cfi_startproc .cfi_startproc
endbranch
movups ($inp),$inout0 # load input movups ($inp),$inout0 # load input
mov 240($key),$rounds # key->rounds mov 240($key),$rounds # key->rounds
___ ___
@ -615,6 +617,7 @@ $code.=<<___;
.align 16 .align 16
aesni_ecb_encrypt: aesni_ecb_encrypt:
.cfi_startproc .cfi_startproc
endbranch
___ ___
$code.=<<___ if ($win64); $code.=<<___ if ($win64);
lea -0x58(%rsp),%rsp lea -0x58(%rsp),%rsp
@ -987,6 +990,7 @@ $code.=<<___;
.align 16 .align 16
aesni_ccm64_encrypt_blocks: aesni_ccm64_encrypt_blocks:
.cfi_startproc .cfi_startproc
endbranch
___ ___
$code.=<<___ if ($win64); $code.=<<___ if ($win64);
lea -0x58(%rsp),%rsp lea -0x58(%rsp),%rsp
@ -1079,6 +1083,7 @@ $code.=<<___;
.align 16 .align 16
aesni_ccm64_decrypt_blocks: aesni_ccm64_decrypt_blocks:
.cfi_startproc .cfi_startproc
endbranch
___ ___
$code.=<<___ if ($win64); $code.=<<___ if ($win64);
lea -0x58(%rsp),%rsp lea -0x58(%rsp),%rsp
@ -1205,6 +1210,7 @@ $code.=<<___;
.align 16 .align 16
aesni_ctr32_encrypt_blocks: aesni_ctr32_encrypt_blocks:
.cfi_startproc .cfi_startproc
endbranch
cmp \$1,$len cmp \$1,$len
jne .Lctr32_bulk jne .Lctr32_bulk
@ -1777,6 +1783,7 @@ $code.=<<___;
.align 16 .align 16
aesni_xts_encrypt: aesni_xts_encrypt:
.cfi_startproc .cfi_startproc
endbranch
lea (%rsp),%r11 # frame pointer lea (%rsp),%r11 # frame pointer
.cfi_def_cfa_register %r11 .cfi_def_cfa_register %r11
push %rbp push %rbp
@ -2260,6 +2267,7 @@ $code.=<<___;
.align 16 .align 16
aesni_xts_decrypt: aesni_xts_decrypt:
.cfi_startproc .cfi_startproc
endbranch
lea (%rsp),%r11 # frame pointer lea (%rsp),%r11 # frame pointer
.cfi_def_cfa_register %r11 .cfi_def_cfa_register %r11
push %rbp push %rbp
@ -2785,6 +2793,7 @@ $code.=<<___;
.align 32 .align 32
aesni_ocb_encrypt: aesni_ocb_encrypt:
.cfi_startproc .cfi_startproc
endbranch
lea (%rsp),%rax lea (%rsp),%rax
push %rbx push %rbx
.cfi_push %rbx .cfi_push %rbx
@ -3251,6 +3260,7 @@ __ocb_encrypt1:
.align 32 .align 32
aesni_ocb_decrypt: aesni_ocb_decrypt:
.cfi_startproc .cfi_startproc
endbranch
lea (%rsp),%rax lea (%rsp),%rax
push %rbx push %rbx
.cfi_push %rbx .cfi_push %rbx
@ -3739,6 +3749,7 @@ $code.=<<___;
.align 16 .align 16
${PREFIX}_cbc_encrypt: ${PREFIX}_cbc_encrypt:
.cfi_startproc .cfi_startproc
endbranch
test $len,$len # check length test $len,$len # check length
jz .Lcbc_ret jz .Lcbc_ret

2
crypto/aes/asm/bsaes-x86_64.pl
View File

@ -1616,6 +1616,7 @@ $code.=<<___;
.align 16 .align 16
bsaes_cbc_encrypt: bsaes_cbc_encrypt:
.cfi_startproc .cfi_startproc
endbranch
___ ___
$code.=<<___ if ($win64); $code.=<<___ if ($win64);
mov 48(%rsp),$arg6 # pull direction flag mov 48(%rsp),$arg6 # pull direction flag
@ -1921,6 +1922,7 @@ $code.=<<___;
.align 16 .align 16
bsaes_ctr32_encrypt_blocks: bsaes_ctr32_encrypt_blocks:
.cfi_startproc .cfi_startproc
endbranch
mov %rsp, %rax mov %rsp, %rax
.Lctr_enc_prologue: .Lctr_enc_prologue:
push %rbp push %rbp

5
crypto/aes/asm/vpaes-x86_64.pl
View File

@ -698,6 +698,7 @@ _vpaes_schedule_mangle:
.align 16 .align 16
${PREFIX}_set_encrypt_key: ${PREFIX}_set_encrypt_key:
.cfi_startproc .cfi_startproc
endbranch
___ ___
$code.=<<___ if ($win64); $code.=<<___ if ($win64);
lea -0xb8(%rsp),%rsp lea -0xb8(%rsp),%rsp
@ -748,6 +749,7 @@ $code.=<<___;
.align 16 .align 16
${PREFIX}_set_decrypt_key: ${PREFIX}_set_decrypt_key:
.cfi_startproc .cfi_startproc
endbranch
___ ___
$code.=<<___ if ($win64); $code.=<<___ if ($win64);
lea -0xb8(%rsp),%rsp lea -0xb8(%rsp),%rsp
@ -803,6 +805,7 @@ $code.=<<___;
.align 16 .align 16
${PREFIX}_encrypt: ${PREFIX}_encrypt:
.cfi_startproc .cfi_startproc
endbranch
___ ___
$code.=<<___ if ($win64); $code.=<<___ if ($win64);
lea -0xb8(%rsp),%rsp lea -0xb8(%rsp),%rsp
@ -848,6 +851,7 @@ $code.=<<___;
.align 16 .align 16
${PREFIX}_decrypt: ${PREFIX}_decrypt:
.cfi_startproc .cfi_startproc
endbranch
___ ___
$code.=<<___ if ($win64); $code.=<<___ if ($win64);
lea -0xb8(%rsp),%rsp lea -0xb8(%rsp),%rsp
@ -899,6 +903,7 @@ $code.=<<___;
.align 16 .align 16
${PREFIX}_cbc_encrypt: ${PREFIX}_cbc_encrypt:
.cfi_startproc .cfi_startproc
endbranch
xchg $key,$len xchg $key,$len
___ ___
($len,$key)=($key,$len); ($len,$key)=($key,$len);

1
crypto/camellia/asm/cmll-x86_64.pl
View File

@ -687,6 +687,7 @@ $code.=<<___;
.align 16 .align 16
Camellia_cbc_encrypt: Camellia_cbc_encrypt:
.cfi_startproc .cfi_startproc
endbranch
cmp \$0,%rdx cmp \$0,%rdx
je .Lcbc_abort je .Lcbc_abort
push %rbx push %rbx

6
crypto/modes/asm/ghash-x86_64.pl
View File

@ -241,6 +241,7 @@ $code=<<___;
.align 16 .align 16
gcm_gmult_4bit: gcm_gmult_4bit:
.cfi_startproc .cfi_startproc
endbranch
push %rbx push %rbx
.cfi_push %rbx .cfi_push %rbx
push %rbp # %rbp and others are pushed exclusively in push %rbp # %rbp and others are pushed exclusively in
@ -288,6 +289,7 @@ $code.=<<___;
.align 16 .align 16
gcm_ghash_4bit: gcm_ghash_4bit:
.cfi_startproc .cfi_startproc
endbranch
push %rbx push %rbx
.cfi_push %rbx .cfi_push %rbx
push %rbp push %rbp
@ -614,6 +616,7 @@ $code.=<<___;
.align 16 .align 16
gcm_gmult_clmul: gcm_gmult_clmul:
.cfi_startproc .cfi_startproc
endbranch
.L_gmult_clmul: .L_gmult_clmul:
movdqu ($Xip),$Xi movdqu ($Xip),$Xi
movdqa .Lbswap_mask(%rip),$T3 movdqa .Lbswap_mask(%rip),$T3
@ -665,6 +668,7 @@ $code.=<<___;
.align 32 .align 32
gcm_ghash_clmul: gcm_ghash_clmul:
.cfi_startproc .cfi_startproc
endbranch
.L_ghash_clmul: .L_ghash_clmul:
___ ___
$code.=<<___ if ($win64); $code.=<<___ if ($win64);
@ -1168,6 +1172,7 @@ $code.=<<___;
.align 32 .align 32
gcm_gmult_avx: gcm_gmult_avx:
.cfi_startproc .cfi_startproc
endbranch
jmp .L_gmult_clmul jmp .L_gmult_clmul
.cfi_endproc .cfi_endproc
.size gcm_gmult_avx,.-gcm_gmult_avx .size gcm_gmult_avx,.-gcm_gmult_avx
@ -1179,6 +1184,7 @@ $code.=<<___;
.align 32 .align 32
gcm_ghash_avx: gcm_ghash_avx:
.cfi_startproc .cfi_startproc
endbranch
___ ___
if ($avx) { if ($avx) {
my ($Xip,$Htbl,$inp,$len)=@_4args; my ($Xip,$Htbl,$inp,$len)=@_4args;

2
crypto/poly1305/asm/poly1305-x86_64.pl
View File

@ -2808,6 +2808,7 @@ $code.=<<___;
.align 32 .align 32
poly1305_blocks_vpmadd52: poly1305_blocks_vpmadd52:
.cfi_startproc .cfi_startproc
endbranch
shr \$4,$len shr \$4,$len
jz .Lno_data_vpmadd52 # too short jz .Lno_data_vpmadd52 # too short
@ -3741,6 +3742,7 @@ $code.=<<___;
.align 32 .align 32
poly1305_emit_base2_44: poly1305_emit_base2_44:
.cfi_startproc .cfi_startproc
endbranch
mov 0($ctx),%r8 # load hash value mov 0($ctx),%r8 # load hash value
mov 8($ctx),%r9 mov 8($ctx),%r9
mov 16($ctx),%r10 mov 16($ctx),%r10

3
crypto/rc4/asm/rc4-x86_64.pl
View File

@ -142,6 +142,7 @@ $code=<<___;
.align 16 .align 16
RC4: RC4:
.cfi_startproc .cfi_startproc
endbranch
or $len,$len or $len,$len
jne .Lentry jne .Lentry
ret ret
@ -457,6 +458,7 @@ $code.=<<___;
.align 16 .align 16
RC4_set_key: RC4_set_key:
.cfi_startproc .cfi_startproc
endbranch
lea 8($dat),$dat lea 8($dat),$dat
lea ($inp,$len),$inp lea ($inp,$len),$inp
neg $len neg $len
@ -531,6 +533,7 @@ RC4_set_key:
.align 16 .align 16
RC4_options: RC4_options:
.cfi_startproc .cfi_startproc
endbranch
lea .Lopts(%rip),%rax lea .Lopts(%rip),%rax
mov OPENSSL_ia32cap_P(%rip),%edx mov OPENSSL_ia32cap_P(%rip),%edx
bt \$20,%edx bt \$20,%edx

9
crypto/x86_64cpuid.pl
View File

@ -42,6 +42,7 @@ print<<___;
.align 16 .align 16
OPENSSL_atomic_add: OPENSSL_atomic_add:
.cfi_startproc .cfi_startproc
endbranch
movl ($arg1),%eax movl ($arg1),%eax
.Lspin: leaq ($arg2,%rax),%r8 .Lspin: leaq ($arg2,%rax),%r8
.byte 0xf0 # lock .byte 0xf0 # lock
@ -58,6 +59,7 @@ OPENSSL_atomic_add:
.align 16 .align 16
OPENSSL_rdtsc: OPENSSL_rdtsc:
.cfi_startproc .cfi_startproc
endbranch
rdtsc rdtsc
shl \$32,%rdx shl \$32,%rdx
or %rdx,%rax or %rdx,%rax
@ -70,6 +72,7 @@ OPENSSL_rdtsc:
.align 16 .align 16
OPENSSL_ia32_cpuid: OPENSSL_ia32_cpuid:
.cfi_startproc .cfi_startproc
endbranch
mov %rbx,%r8 # save %rbx mov %rbx,%r8 # save %rbx
.cfi_register %rbx,%r8 .cfi_register %rbx,%r8
@ -239,6 +242,7 @@ OPENSSL_ia32_cpuid:
.align 16 .align 16
OPENSSL_cleanse: OPENSSL_cleanse:
.cfi_startproc .cfi_startproc
endbranch
xor %rax,%rax xor %rax,%rax
cmp \$15,$arg2 cmp \$15,$arg2
jae .Lot jae .Lot
@ -276,6 +280,7 @@ OPENSSL_cleanse:
.align 16 .align 16
CRYPTO_memcmp: CRYPTO_memcmp:
.cfi_startproc .cfi_startproc
endbranch
xor %rax,%rax xor %rax,%rax
xor %r10,%r10 xor %r10,%r10
cmp \$0,$arg3 cmp \$0,$arg3
@ -314,6 +319,7 @@ print<<___ if (!$win64);
.align 16 .align 16
OPENSSL_wipe_cpu: OPENSSL_wipe_cpu:
.cfi_startproc .cfi_startproc
endbranch
pxor %xmm0,%xmm0 pxor %xmm0,%xmm0
pxor %xmm1,%xmm1 pxor %xmm1,%xmm1
pxor %xmm2,%xmm2 pxor %xmm2,%xmm2
@ -378,6 +384,7 @@ print<<___;
.align 16 .align 16
OPENSSL_instrument_bus: OPENSSL_instrument_bus:
.cfi_startproc .cfi_startproc
endbranch
mov $arg1,$out # tribute to Win64 mov $arg1,$out # tribute to Win64
mov $arg2,$cnt mov $arg2,$cnt
mov $arg2,$max mov $arg2,$max
@ -412,6 +419,7 @@ OPENSSL_instrument_bus:
.align 16 .align 16
OPENSSL_instrument_bus2: OPENSSL_instrument_bus2:
.cfi_startproc .cfi_startproc
endbranch
mov $arg1,$out # tribute to Win64 mov $arg1,$out # tribute to Win64
mov $arg2,$cnt mov $arg2,$cnt
mov $arg3,$max mov $arg3,$max
@ -467,6 +475,7 @@ print<<___;
.align 16 .align 16
OPENSSL_ia32_${rdop}_bytes: OPENSSL_ia32_${rdop}_bytes:
.cfi_startproc .cfi_startproc
endbranch
xor %rax, %rax # return value xor %rax, %rax # return value
cmp \$0,$arg2 cmp \$0,$arg2
je .Ldone_${rdop}_bytes je .Ldone_${rdop}_bytes