[clang] add a 'DisableCFICheck' restriction to KCFI

gmh5225 · web-flow · commit 4bd464917d12 · 2024-09-16T05:53:40.000+08:00
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
@@ -1071,7 +1071,8 @@ void CodeGenModule::Release() {
                               CodeGenOpts.SanitizeCfiCanonicalJumpTables);
   }
 
-  if (LangOpts.Sanitize.has(SanitizerKind::KCFI)) {
+  if (LangOpts.Sanitize.has(SanitizerKind::KCFI) &&
+      !CodeGenOpts.DisableCFICheck) {
     getModule().addModuleFlag(llvm::Module::Override, "kcfi", 1);
     // KCFI assumes patchable-function-prefix is the same for all indirectly
     // called functions. Store the expected offset for code generation.

Original file line number	Diff line number	Diff line change
`@@ -1071,7 +1071,8 @@ void CodeGenModule::Release() {`
`1071`	`1071`	`CodeGenOpts.SanitizeCfiCanonicalJumpTables);`
`1072`	`1072`	`}`
`1073`	`1073`
`1074`		`- if (LangOpts.Sanitize.has(SanitizerKind::KCFI)) {`
	`1074`	`+ if (LangOpts.Sanitize.has(SanitizerKind::KCFI) &&`
	`1075`	`+ !CodeGenOpts.DisableCFICheck) {`
`1075`	`1076`	`getModule().addModuleFlag(llvm::Module::Override, "kcfi", 1);`
`1076`	`1077`	`// KCFI assumes patchable-function-prefix is the same for all indirectly`
`1077`	`1078`	`// called functions. Store the expected offset for code generation.`