!163 #I5UVJS:添加前向CFI使能

Merge pull request !163 from liyufan/master

wpa_supplicant-2.9_standard/BUILD.gn

@@ -46,6 +46,11 @@ config("wpa_warnings") {
 }
 
 ohos_shared_library("wpa_client") {
+  sanitize = {
+    cfi = true
+    debug = false
+  }
+
   output_name = "wpa_client"
   sources = [
     "$WPA_ROOT_DIR/src/common/wpa_ctrl.c",
@@ -112,6 +117,10 @@ ohos_shared_library("wpa_client") {
 }
 
 ohos_shared_library("wpa") {
+  sanitize = {
+    cfi = true
+    debug = false
+  }
   output_name = "wpa"
   sources = [
     # wpa & hostapd

wpa_supplicant-2.9_standard/src/utils/wpa_debug.c

@@ -729,7 +729,7 @@ void wpa_debug_close_file(void)
 }
 
 
-void wpa_debug_setup_stdout(void)
+void wpa_debug_setup_stdout(void) __attribute__((no_sanitize("cfi")))
 {
 #ifndef _WIN32
 	setvbuf(stdout, NULL, _IOLBF, 0);
@@ -755,7 +755,7 @@ void wpa_msg_register_ifname_cb(wpa_msg_get_ifname_func func)
 	wpa_msg_ifname_cb = func;
 }
 
-void wpa_msg(void *ctx, int level, const char *fmt, ...)
+void wpa_msg(void *ctx, int level, const char *fmt, ...) __attribute__((no_sanitize("cfi")))
 {
 	va_list ap;
 	char *buf;
@@ -793,7 +793,7 @@ void wpa_msg(void *ctx, int level, const char *fmt, ...)
 }
 
 
-void wpa_msg_ctrl(void *ctx, int level, const char *fmt, ...)
+void wpa_msg_ctrl(void *ctx, int level, const char *fmt, ...) __attribute__((no_sanitize("cfi")))
 {
 	va_list ap;
 	char *buf;
@@ -821,7 +821,7 @@ void wpa_msg_ctrl(void *ctx, int level, const char *fmt, ...)
 }
 
 
-void wpa_msg_global(void *ctx, int level, const char *fmt, ...)
+void wpa_msg_global(void *ctx, int level, const char *fmt, ...) __attribute__((no_sanitize("cfi")))
 {
 	va_list ap;
 	char *buf;
@@ -876,7 +876,7 @@ void wpa_msg_global_ctrl(void *ctx, int level, const char *fmt, ...)
 }
 
 
-void wpa_msg_no_global(void *ctx, int level, const char *fmt, ...)
+void wpa_msg_no_global(void *ctx, int level, const char *fmt, ...) __attribute__((no_sanitize("cfi")))
 {
 	va_list ap;
 	char *buf;