libsemanage/tests: silence function UBSAN

cgzones · cgzones · commit dc85199e10bd · 2023-11-01T15:39:10.000+01:00
Signed-off-by: Christian Göttsche &lt;cgzones@googlemail.com&gt;
diff --git a/libsemanage/src/database.c b/libsemanage/src/database.c
@@ -21,6 +21,7 @@ static int assert_init(semanage_handle_t * handle, dbase_config_t * dconfig)
 	return STATUS_SUCCESS;
 }
 
+__attribute__((no_sanitize("function")))
 static int enter_ro(semanage_handle_t * handle, dbase_config_t * dconfig)
 {
 
@@ -58,6 +59,7 @@ static inline int exit_ro(semanage_handle_t * handle)
 	return commit_num;
 }
 
+__attribute__((no_sanitize("function")))
 static int enter_rw(semanage_handle_t * handle, dbase_config_t * dconfig)
 {
 
@@ -79,6 +81,7 @@ static int enter_rw(semanage_handle_t * handle, dbase_config_t * dconfig)
 	return STATUS_ERR;
 }
 
+__attribute__((no_sanitize("function")))
 int dbase_modify(semanage_handle_t * handle,
 		 dbase_config_t * dconfig,
 		 const record_key_t * key, const record_t * data)
@@ -93,6 +96,7 @@ int dbase_modify(semanage_handle_t * handle,
 	return STATUS_SUCCESS;
 }
 
+__attribute__((no_sanitize("function")))
 int dbase_set(semanage_handle_t * handle,
 	      dbase_config_t * dconfig,
 	      const record_key_t * key, const record_t * data)
@@ -107,6 +111,7 @@ int dbase_set(semanage_handle_t * handle,
 	return STATUS_SUCCESS;
 }
 
+__attribute__((no_sanitize("function")))
 int dbase_del(semanage_handle_t * handle,
 	      dbase_config_t * dconfig, const record_key_t * key)
 {
@@ -120,6 +125,7 @@ int dbase_del(semanage_handle_t * handle,
 	return STATUS_SUCCESS;
 }
 
+__attribute__((no_sanitize("function")))
 int dbase_query(semanage_handle_t * handle,
 		dbase_config_t * dconfig,
 		const record_key_t * key, record_t ** response)
@@ -136,6 +142,7 @@ int dbase_query(semanage_handle_t * handle,
 	return exit_ro(handle);
 }
 
+__attribute__((no_sanitize("function")))
 int dbase_exists(semanage_handle_t * handle,
 		 dbase_config_t * dconfig,
 		 const record_key_t * key, int *response)
@@ -152,6 +159,7 @@ int dbase_exists(semanage_handle_t * handle,
 	return exit_ro(handle);
 }
 
+__attribute__((no_sanitize("function")))
 int dbase_count(semanage_handle_t * handle,
 		dbase_config_t * dconfig, unsigned int *response)
 {
@@ -167,6 +175,7 @@ int dbase_count(semanage_handle_t * handle,
 	return exit_ro(handle);
 }
 
+__attribute__((no_sanitize("function")))
 int dbase_iterate(semanage_handle_t * handle,
 		  dbase_config_t * dconfig,
 		  int (*fn) (const record_t * record,
@@ -184,6 +193,7 @@ int dbase_iterate(semanage_handle_t * handle,
 	return exit_ro(handle);
 }
 
+__attribute__((no_sanitize("function")))
 int dbase_list(semanage_handle_t * handle,
 	       dbase_config_t * dconfig,
 	       record_t *** records, unsigned int *count)
diff --git a/libsemanage/src/database_file.c b/libsemanage/src/database_file.c
@@ -37,6 +37,7 @@ struct dbase_file {
 	record_file_table_t *rftable;
 };
 
+__attribute__((no_sanitize("function")))
 static int dbase_file_cache(semanage_handle_t * handle, dbase_file_t * dbase)
 {
 
diff --git a/libsemanage/src/database_join.c b/libsemanage/src/database_join.c
@@ -34,6 +34,7 @@ struct dbase_join {
 	record_join_table_t *rjtable;
 };
 
+__attribute__((no_sanitize("function")))
 static int dbase_join_cache(semanage_handle_t * handle, dbase_join_t * dbase)
 {
 
@@ -170,6 +171,7 @@ static int dbase_join_cache(semanage_handle_t * handle, dbase_join_t * dbase)
 }
 
 /* Flush database */
+__attribute__((no_sanitize("function")))
 static int dbase_join_flush(semanage_handle_t * handle, dbase_join_t * dbase)
 {
 
diff --git a/libsemanage/src/database_llist.c b/libsemanage/src/database_llist.c
@@ -34,6 +34,7 @@ int dbase_llist_needs_resync(semanage_handle_t * handle, dbase_llist_t * dbase)
 }
 
 /* Helper for adding records to the cache */
+__attribute__((no_sanitize("function")))
 int dbase_llist_cache_prepend(semanage_handle_t * handle,
 			      dbase_llist_t * dbase, const record_t * data)
 {
@@ -67,6 +68,7 @@ int dbase_llist_cache_prepend(semanage_handle_t * handle,
 	return STATUS_ERR;
 }
 
+__attribute__((no_sanitize("function")))
 void dbase_llist_drop_cache(dbase_llist_t * dbase)
 {
 
@@ -99,6 +101,7 @@ int dbase_llist_set_serial(semanage_handle_t * handle, dbase_llist_t * dbase)
 }
 
 /* Helper for finding records in the cache */
+__attribute__((no_sanitize("function")))
 static int dbase_llist_cache_locate(semanage_handle_t * handle,
 				    dbase_llist_t * dbase,
 				    const record_key_t * key,
@@ -226,6 +229,7 @@ int dbase_llist_modify(semanage_handle_t * handle,
 	return STATUS_SUCCESS;
 }
 
+__attribute__((no_sanitize("function")))
 int dbase_llist_query(semanage_handle_t * handle,
 		      dbase_llist_t * dbase,
 		      const record_key_t * key, record_t ** response)
@@ -248,6 +252,7 @@ int dbase_llist_query(semanage_handle_t * handle,
 	return STATUS_ERR;
 }
 
+__attribute__((no_sanitize("function")))
 int dbase_llist_iterate(semanage_handle_t * handle,
 			dbase_llist_t * dbase,
 			int (*fn) (const record_t * record,
@@ -274,6 +279,7 @@ int dbase_llist_iterate(semanage_handle_t * handle,
 	return STATUS_ERR;
 }
 
+__attribute__((no_sanitize("function")))
 int dbase_llist_del(semanage_handle_t * handle __attribute__ ((unused)),
 		    dbase_llist_t * dbase, const record_key_t * key)
 {
@@ -304,6 +310,7 @@ int dbase_llist_del(semanage_handle_t * handle __attribute__ ((unused)),
 	return STATUS_SUCCESS;
 }
 
+__attribute__((no_sanitize("function")))
 int dbase_llist_clear(semanage_handle_t * handle, dbase_llist_t * dbase)
 {
 
@@ -331,6 +338,7 @@ int dbase_llist_clear(semanage_handle_t * handle, dbase_llist_t * dbase)
 	return STATUS_SUCCESS;
 }
 
+__attribute__((no_sanitize("function")))
 int dbase_llist_list(semanage_handle_t * handle,
 		     dbase_llist_t * dbase,
 		     record_t *** records, unsigned int *count)
diff --git a/libsemanage/src/database_policydb.c b/libsemanage/src/database_policydb.c
@@ -382,6 +382,7 @@ struct list_handler_arg {
 	int pos;
 };
 
+__attribute__((no_sanitize("function")))
 static int list_handler(const record_t * record, void *varg)
 {
 
diff --git a/libsemanage/src/direct_api.c b/libsemanage/src/direct_api.c
@@ -1141,6 +1141,7 @@ static int copy_file_if_exists(const char *src, const char *dst, mode_t mode){
 /* Commits all changes in sandbox to the actual kernel policy.
  * Returns commit number on success, -1 on error.
  */
+__attribute__((no_sanitize("function")))
 static int semanage_direct_commit(semanage_handle_t * sh)
 {
 	char **mod_filenames = NULL;
diff --git a/libsemanage/tests/test_handle.c b/libsemanage/tests/test_handle.c
@@ -317,6 +317,7 @@ static void helper_select_store(const char *name, enum semanage_connect_type typ
 		cleanup_handle(SH_HANDLE);
 }
 
+__attribute__((no_sanitize("implicit-integer-sign-change")))
 static void test_select_store(void)
 {
 	helper_select_store("asdf", SEMANAGE_CON_INVALID - 1, -1);

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ static int assert_init(semanage_handle_t * handle, dbase_config_t * dconfig)`
`21`	`21`	`return STATUS_SUCCESS;`
`22`	`22`	`}`
`23`	`23`
	`24`	`+__attribute__((no_sanitize("function")))`
`24`	`25`	`static int enter_ro(semanage_handle_t * handle, dbase_config_t * dconfig)`
`25`	`26`	`{`
`26`	`27`
`@@ -58,6 +59,7 @@ static inline int exit_ro(semanage_handle_t * handle)`
`58`	`59`	`return commit_num;`
`59`	`60`	`}`
`60`	`61`
	`62`	`+__attribute__((no_sanitize("function")))`
`61`	`63`	`static int enter_rw(semanage_handle_t * handle, dbase_config_t * dconfig)`
`62`	`64`	`{`
`63`	`65`
`@@ -79,6 +81,7 @@ static int enter_rw(semanage_handle_t * handle, dbase_config_t * dconfig)`
`79`	`81`	`return STATUS_ERR;`
`80`	`82`	`}`
`81`	`83`
	`84`	`+__attribute__((no_sanitize("function")))`
`82`	`85`	`int dbase_modify(semanage_handle_t * handle,`
`83`	`86`	`dbase_config_t * dconfig,`
`84`	`87`	`const record_key_t * key, const record_t * data)`
`@@ -93,6 +96,7 @@ int dbase_modify(semanage_handle_t * handle,`
`93`	`96`	`return STATUS_SUCCESS;`
`94`	`97`	`}`
`95`	`98`
	`99`	`+__attribute__((no_sanitize("function")))`
`96`	`100`	`int dbase_set(semanage_handle_t * handle,`
`97`	`101`	`dbase_config_t * dconfig,`
`98`	`102`	`const record_key_t * key, const record_t * data)`
`@@ -107,6 +111,7 @@ int dbase_set(semanage_handle_t * handle,`
`107`	`111`	`return STATUS_SUCCESS;`
`108`	`112`	`}`
`109`	`113`
	`114`	`+__attribute__((no_sanitize("function")))`
`110`	`115`	`int dbase_del(semanage_handle_t * handle,`
`111`	`116`	`dbase_config_t * dconfig, const record_key_t * key)`
`112`	`117`	`{`
`@@ -120,6 +125,7 @@ int dbase_del(semanage_handle_t * handle,`
`120`	`125`	`return STATUS_SUCCESS;`
`121`	`126`	`}`
`122`	`127`
	`128`	`+__attribute__((no_sanitize("function")))`
`123`	`129`	`int dbase_query(semanage_handle_t * handle,`
`124`	`130`	`dbase_config_t * dconfig,`
`125`	`131`	`const record_key_t * key, record_t ** response)`
`@@ -136,6 +142,7 @@ int dbase_query(semanage_handle_t * handle,`
`136`	`142`	`return exit_ro(handle);`
`137`	`143`	`}`
`138`	`144`
	`145`	`+__attribute__((no_sanitize("function")))`
`139`	`146`	`int dbase_exists(semanage_handle_t * handle,`
`140`	`147`	`dbase_config_t * dconfig,`
`141`	`148`	`const record_key_t * key, int *response)`
`@@ -152,6 +159,7 @@ int dbase_exists(semanage_handle_t * handle,`
`152`	`159`	`return exit_ro(handle);`
`153`	`160`	`}`
`154`	`161`
	`162`	`+__attribute__((no_sanitize("function")))`
`155`	`163`	`int dbase_count(semanage_handle_t * handle,`
`156`	`164`	`dbase_config_t * dconfig, unsigned int *response)`
`157`	`165`	`{`
`@@ -167,6 +175,7 @@ int dbase_count(semanage_handle_t * handle,`
`167`	`175`	`return exit_ro(handle);`
`168`	`176`	`}`
`169`	`177`
	`178`	`+__attribute__((no_sanitize("function")))`
`170`	`179`	`int dbase_iterate(semanage_handle_t * handle,`
`171`	`180`	`dbase_config_t * dconfig,`
`172`	`181`	`int (fn) (const record_t record,`
`@@ -184,6 +193,7 @@ int dbase_iterate(semanage_handle_t * handle,`
`184`	`193`	`return exit_ro(handle);`
`185`	`194`	`}`
`186`	`195`
	`196`	`+__attribute__((no_sanitize("function")))`
`187`	`197`	`int dbase_list(semanage_handle_t * handle,`
`188`	`198`	`dbase_config_t * dconfig,`
`189`	`199`	`record_t *** records, unsigned int *count)`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ struct dbase_file {`
`37`	`37`	`record_file_table_t *rftable;`
`38`	`38`	`};`
`39`	`39`
	`40`	`+__attribute__((no_sanitize("function")))`
`40`	`41`	`static int dbase_file_cache(semanage_handle_t * handle, dbase_file_t * dbase)`
`41`	`42`	`{`
`42`	`43`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ struct dbase_join {`
`34`	`34`	`record_join_table_t *rjtable;`
`35`	`35`	`};`
`36`	`36`
	`37`	`+__attribute__((no_sanitize("function")))`
`37`	`38`	`static int dbase_join_cache(semanage_handle_t * handle, dbase_join_t * dbase)`
`38`	`39`	`{`
`39`	`40`
`@@ -170,6 +171,7 @@ static int dbase_join_cache(semanage_handle_t * handle, dbase_join_t * dbase)`
`170`	`171`	`}`
`171`	`172`
`172`	`173`	`/* Flush database */`
	`174`	`+__attribute__((no_sanitize("function")))`
`173`	`175`	`static int dbase_join_flush(semanage_handle_t * handle, dbase_join_t * dbase)`
`174`	`176`	`{`
`175`	`177`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ int dbase_llist_needs_resync(semanage_handle_t * handle, dbase_llist_t * dbase)`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`/* Helper for adding records to the cache */`
	`37`	`+__attribute__((no_sanitize("function")))`
`37`	`38`	`int dbase_llist_cache_prepend(semanage_handle_t * handle,`
`38`	`39`	`dbase_llist_t * dbase, const record_t * data)`
`39`	`40`	`{`
`@@ -67,6 +68,7 @@ int dbase_llist_cache_prepend(semanage_handle_t * handle,`
`67`	`68`	`return STATUS_ERR;`
`68`	`69`	`}`
`69`	`70`
	`71`	`+__attribute__((no_sanitize("function")))`
`70`	`72`	`void dbase_llist_drop_cache(dbase_llist_t * dbase)`
`71`	`73`	`{`
`72`	`74`
`@@ -99,6 +101,7 @@ int dbase_llist_set_serial(semanage_handle_t * handle, dbase_llist_t * dbase)`
`99`	`101`	`}`
`100`	`102`
`101`	`103`	`/* Helper for finding records in the cache */`
	`104`	`+__attribute__((no_sanitize("function")))`
`102`	`105`	`static int dbase_llist_cache_locate(semanage_handle_t * handle,`
`103`	`106`	`dbase_llist_t * dbase,`
`104`	`107`	`const record_key_t * key,`
`@@ -226,6 +229,7 @@ int dbase_llist_modify(semanage_handle_t * handle,`
`226`	`229`	`return STATUS_SUCCESS;`
`227`	`230`	`}`
`228`	`231`
	`232`	`+__attribute__((no_sanitize("function")))`
`229`	`233`	`int dbase_llist_query(semanage_handle_t * handle,`
`230`	`234`	`dbase_llist_t * dbase,`
`231`	`235`	`const record_key_t * key, record_t ** response)`
`@@ -248,6 +252,7 @@ int dbase_llist_query(semanage_handle_t * handle,`
`248`	`252`	`return STATUS_ERR;`
`249`	`253`	`}`
`250`	`254`
	`255`	`+__attribute__((no_sanitize("function")))`
`251`	`256`	`int dbase_llist_iterate(semanage_handle_t * handle,`
`252`	`257`	`dbase_llist_t * dbase,`
`253`	`258`	`int (fn) (const record_t record,`
`@@ -274,6 +279,7 @@ int dbase_llist_iterate(semanage_handle_t * handle,`
`274`	`279`	`return STATUS_ERR;`
`275`	`280`	`}`
`276`	`281`
	`282`	`+__attribute__((no_sanitize("function")))`
`277`	`283`	`int dbase_llist_del(semanage_handle_t * handle __attribute__ ((unused)),`
`278`	`284`	`dbase_llist_t * dbase, const record_key_t * key)`
`279`	`285`	`{`
`@@ -304,6 +310,7 @@ int dbase_llist_del(semanage_handle_t * handle __attribute__ ((unused)),`
`304`	`310`	`return STATUS_SUCCESS;`
`305`	`311`	`}`
`306`	`312`
	`313`	`+__attribute__((no_sanitize("function")))`
`307`	`314`	`int dbase_llist_clear(semanage_handle_t * handle, dbase_llist_t * dbase)`
`308`	`315`	`{`
`309`	`316`
`@@ -331,6 +338,7 @@ int dbase_llist_clear(semanage_handle_t * handle, dbase_llist_t * dbase)`
`331`	`338`	`return STATUS_SUCCESS;`
`332`	`339`	`}`
`333`	`340`
	`341`	`+__attribute__((no_sanitize("function")))`
`334`	`342`	`int dbase_llist_list(semanage_handle_t * handle,`
`335`	`343`	`dbase_llist_t * dbase,`
`336`	`344`	`record_t *** records, unsigned int *count)`
Original file line number	Diff line number	Diff line change
`@@ -382,6 +382,7 @@ struct list_handler_arg {`
`382`	`382`	`int pos;`
`383`	`383`	`};`
`384`	`384`
	`385`	`+__attribute__((no_sanitize("function")))`
`385`	`386`	`static int list_handler(const record_t * record, void *varg)`
`386`	`387`	`{`
`387`	`388`
Original file line number	Diff line number	Diff line change
`@@ -1141,6 +1141,7 @@ static int copy_file_if_exists(const char src, const char dst, mode_t mode){`
`1141`	`1141`	`/* Commits all changes in sandbox to the actual kernel policy.`
`1142`	`1142`	`* Returns commit number on success, -1 on error.`
`1143`	`1143`	`*/`
	`1144`	`+__attribute__((no_sanitize("function")))`
`1144`	`1145`	`static int semanage_direct_commit(semanage_handle_t * sh)`
`1145`	`1146`	`{`
`1146`	`1147`	`char **mod_filenames = NULL;`
Original file line number	Diff line number	Diff line change
`@@ -317,6 +317,7 @@ static void helper_select_store(const char *name, enum semanage_connect_type typ`
`317`	`317`	`cleanup_handle(SH_HANDLE);`
`318`	`318`	`}`
`319`	`319`
	`320`	`+__attribute__((no_sanitize("implicit-integer-sign-change")))`
`320`	`321`	`static void test_select_store(void)`
`321`	`322`	`{`
`322`	`323`	`helper_select_store("asdf", SEMANAGE_CON_INVALID - 1, -1);`