procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Provide -fcf-protection=branch,return.

Browse source 
Use EnumSet instead of EnumBitSet since CF_FULL is not power of 2.
It is a bit tricky for sets classification, cf_branch and cf_return
should be in different sets, but they both "conflicts" cf_full,
cf_none. And current EnumSet don't handle this well.

So in the current implementation, only cf_full,cf_none are exclusive
to each other, but they can be combined with any cf_branch, cf_return,
cf_check. It's not perfect, but still an improvement than original
one.

gcc/ChangeLog:

	PR target/89701
	* common.opt: (fcf-protection=): Add EnumSet attribute to
	support combination of params.

gcc/testsuite/ChangeLog:

	* c-c++-common/fcf-protection-10.c: New test.
	* c-c++-common/fcf-protection-11.c: New test.
	* c-c++-common/fcf-protection-12.c: New test.
	* c-c++-common/fcf-protection-8.c: New test.
	* c-c++-common/fcf-protection-9.c: New test.
	* gcc.target/i386/pr89701-1.c: New test.
	* gcc.target/i386/pr89701-2.c: New test.
	* gcc.target/i386/pr89701-3.c: New test.
This commit is contained in:
liuhongt 2023-05-12 15:15:08 +08:00
parent 629ad1cfda
commit 1c6231c05b
9 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gcc/common.opt
View file

@ -1908,7 +1908,7 @@ fcf-protection
Common RejectNegative Alias(fcf-protection=,full)
fcf-protection=
Common Joined RejectNegative Enum(cf_protection_level) Var(flag_cf_protection) Init(CF_NONE)
Common Joined RejectNegative Enum(cf_protection_level) EnumSet Var(flag_cf_protection) Init(CF_NONE)
-fcf-protection=[full|branch|return|none|check] Instrument functions with checks to verify jump/call/return control-flow transfer
instructions have valid targets.
@ -1916,19 +1916,19 @@ Enum
Name(cf_protection_level) Type(enum cf_protection_level) UnknownError(unknown Control-Flow Protection Level %qs)
EnumValue
Enum(cf_protection_level) String(full) Value(CF_FULL)
Enum(cf_protection_level) String(full) Value(CF_FULL) Set(1)
EnumValue
Enum(cf_protection_level) String(branch) Value(CF_BRANCH)
Enum(cf_protection_level) String(branch) Value(CF_BRANCH) Set(2)
EnumValue
Enum(cf_protection_level) String(return) Value(CF_RETURN)
Enum(cf_protection_level) String(return) Value(CF_RETURN) Set(3)
EnumValue
Enum(cf_protection_level) String(check) Value(CF_CHECK)
Enum(cf_protection_level) String(check) Value(CF_CHECK) Set(4)
EnumValue
Enum(cf_protection_level) String(none) Value(CF_NONE)
Enum(cf_protection_level) String(none) Value(CF_NONE) Set(1)
finstrument-functions
Common Var(flag_instrument_function_entry_exit,1)

2
gcc/testsuite/c-c++-common/fcf-protection-10.c Normal file
View file

@ -0,0 +1,2 @@
/* { dg-do compile { target { "i?86-*-* x86_64-*-*" } } } */
/* { dg-options "-fcf-protection=branch,check" } */

2
gcc/testsuite/c-c++-common/fcf-protection-11.c Normal file
View file

@ -0,0 +1,2 @@
/* { dg-do compile { target { "i?86-*-* x86_64-*-*" } } } */
/* { dg-options "-fcf-protection=branch,return" } */

2
gcc/testsuite/c-c++-common/fcf-protection-12.c Normal file
View file

@ -0,0 +1,2 @@
/* { dg-do compile { target { "i?86-*-* x86_64-*-*" } } } */
/* { dg-options "-fcf-protection=return,branch" } */

2
gcc/testsuite/c-c++-common/fcf-protection-8.c Normal file
View file

@ -0,0 +1,2 @@
/* { dg-do compile { target { "i?86-*-* x86_64-*-*" } } } */
/* { dg-options "-fcf-protection=branch,none" } */

2
gcc/testsuite/c-c++-common/fcf-protection-9.c Normal file
View file

@ -0,0 +1,2 @@
/* { dg-do compile { target { "i?86-*-* x86_64-*-*" } } } */
/* { dg-options "-fcf-protection=branch,full" } */

4
gcc/testsuite/gcc.target/i386/pr89701-1.c Normal file
View file

@ -0,0 +1,4 @@
/* { dg-do compile { target *-*-linux* } } */
/* { dg-options "-fcf-protection=branch,return" } */
/* { dg-final { scan-assembler-times ".note.gnu.property" 1 } } */
/* { dg-final { scan-assembler-times ".long 0x3" 1 } } */

4
gcc/testsuite/gcc.target/i386/pr89701-2.c Normal file
View file

@ -0,0 +1,4 @@
/* { dg-do compile { target *-*-linux* } } */
/* { dg-options "-fcf-protection=return,branch" } */
/* { dg-final { scan-assembler-times ".note.gnu.property" 1 } } */
/* { dg-final { scan-assembler-times ".long 0x3" 1 } } */

4
gcc/testsuite/gcc.target/i386/pr89701-3.c Normal file
View file

@ -0,0 +1,4 @@
/* { dg-do compile { target *-*-linux* } } */
/* { dg-options "-fcf-protection=return,none" } */
/* { dg-final { scan-assembler-times ".note.gnu.property" 1 } } */
/* { dg-final { scan-assembler-times ".long 0x2" 1 } } */