mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-26 11:53:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

x86: Add endbranch to indirect branch targets for Intel CET

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

Since x86 cbc.pl uses indirect branch with a jump table, we also need
to add endbranch to all jump targets.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/10984)
This commit is contained in:
H.J. Lu 2020-01-31 05:07:01 -08:00 committed by Pauli
parent 34b167625a
commit e558ae4921
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/perlasm/cbc.pl
View File

@ -165,21 +165,28 @@ sub cbc
&jmp_ptr($count);
&set_label("ej7");
&endbranch()
&movb(&HB("edx"), &BP(6,$in,"",0));
&shl("edx",8);
&set_label("ej6");
&endbranch()
&movb(&HB("edx"), &BP(5,$in,"",0));
&set_label("ej5");
&endbranch()
&movb(&LB("edx"), &BP(4,$in,"",0));
&set_label("ej4");
&endbranch()
&mov("ecx", &DWP(0,$in,"",0));
&jmp(&label("ejend"));
&set_label("ej3");
&endbranch()
&movb(&HB("ecx"), &BP(2,$in,"",0));
&shl("ecx",8);
&set_label("ej2");
&endbranch()
&movb(&HB("ecx"), &BP(1,$in,"",0));
&set_label("ej1");
&endbranch()
&movb(&LB("ecx"), &BP(0,$in,"",0));
&set_label("ejend");

1
crypto/perlasm/x86gas.pl
View File

@ -124,6 +124,7 @@ sub ::function_begin_B
push(@out,".align\t$align\n");
push(@out,"$func:\n");
push(@out,"$begin:\n") if ($global);
&::endbranch();
$::stack=4;
}