Merge pull request #43 from 0152la/license

ltratt · web-flow · commit 6cb2842ca3dd · 2025-02-19T12:14:54.000Z
Add COPYRIGHT file
diff --git a/COPYRIGHT b/COPYRIGHT
@@ -0,0 +1,15 @@
+Except as otherwise noted (below and/or in individual files), this project is
+licensed under the Apache License, Version 2.0 <LICENSE-APACHE>
+<http://www.apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT>
+<http://opensource.org/licenses/MIT>, at your option.
+
+Copyright is retained by contributors and/or the organisations they
+represent(ed) -- this project does not require copyright assignment. Please see
+version control history for a full list of contributors. Note that some files
+may include explicit copyright and/or licensing notices.
+
+The following contributors wish to explicitly make it known that the copyright
+of their contributions is retained by an organisation:
+
+    Laurence Tratt <laurie@tratt.net>:
+      copyright retained by King's College London
diff --git a/include/compartment.h b/include/compartment.h
@@ -42,7 +42,7 @@ int64_t
 comp_exec_in(void *, void *__capability, void *, void *, size_t,
     void *__capability, void *);
 void
-comp_exec_out();
+comp_exec_out(void);
 
 // Declare built-in function for cache synchronization:
 // https://community.arm.com/arm-community-blogs/b/architectures-and-processors-blog/posts/caches-and-self-modifying-code
diff --git a/include/intercept.h b/include/intercept.h
@@ -22,7 +22,7 @@ struct Compartment *manager_get_compartment_by_id(size_t);
 
 extern void *__capability manager_ddc;
 extern void
-comp_exec_out();
+comp_exec_out(void);
 
 // Number of capabilities required to perform a transition
 #define COMP_RETURN_CAPS_COUNT 2
@@ -52,10 +52,10 @@ struct FuncIntercept
  * most likely break things.
  */
 void
-intercept_wrapper();
+intercept_wrapper(void);
 
 void
-setup_intercepts();
+setup_intercepts(void);
 
 // TODO Reimplement this for inter-compartment function calls
 // size_t
diff --git a/include/linux_harness.h b/include/linux_harness.h
@@ -4,7 +4,7 @@
 #define __capability
 
 void *
-cheri_ddc_get()
+cheri_ddc_get(void)
 {
     return NULL;
 }
diff --git a/include/manager.h b/include/manager.h
@@ -46,7 +46,7 @@ union arg_holder
 char *
 prep_config_filename(char *);
 void
-clean_all_comps();
+clean_all_comps(void);
 void
 clean_comp(struct Compartment *);
 void
diff --git a/include/symbols_comp.h b/include/symbols_comp.h
@@ -18,7 +18,7 @@ struct CompSymbol
 };
 
 comp_symbol_list *
-comp_syms_init();
+comp_syms_init(void);
 void
 comp_syms_clean(comp_symbol_list *);
 void
diff --git a/include/symbols_lib.h b/include/symbols_lib.h
@@ -19,7 +19,7 @@ struct LibDependencySymbol
 };
 
 lib_symbol_list *
-lib_syms_init();
+lib_syms_init(void);
 void
 lib_syms_clean(lib_symbol_list *);
 void
diff --git a/src/comp_utils.c b/src/comp_utils.c
@@ -209,7 +209,7 @@ reallocarray(void *to_realloc, size_t elem_count, size_t elem_size)
 }
 
 void
-tls_lookup_stub()
+tls_lookup_stub(void)
 {
     // Get TLS index
     // TODO works only for one TLS region
diff --git a/src/compartment.c b/src/compartment.c
@@ -9,9 +9,9 @@ const char *comp_utils_soname = "libcomputils.so";
  ******************************************************************************/
 
 static struct Compartment *
-comp_init();
+comp_init(void);
 static struct LibDependency *
-lib_init();
+lib_init(void);
 
 static struct LibDependency *
 parse_lib_file(char *, struct Compartment *);
@@ -77,7 +77,7 @@ print_comp_simple(struct Compartment *);
  * be set in `comp_from_elf`.
  */
 static struct Compartment *
-comp_init()
+comp_init(void)
 {
     // TODO order
     struct Compartment *new_comp = malloc(sizeof(struct Compartment));
@@ -105,7 +105,7 @@ comp_init()
 }
 
 static struct LibDependency *
-lib_init()
+lib_init(void)
 {
     struct LibDependency *new_lib = malloc(sizeof(struct LibDependency));
 
diff --git a/src/intercept.c b/src/intercept.c
@@ -17,7 +17,7 @@ void *__capability sealed_redirect_cap;
  *      this is the only component visible to the compartments
  */
 void
-setup_intercepts()
+setup_intercepts(void)
 {
     sealed_redirect_cap = manager_ddc;
     sealed_redirect_cap
diff --git a/src/manager.c b/src/manager.c
@@ -46,13 +46,13 @@ parse_compartment_config_params(const toml_table_t *, struct CompConfig *);
 static void
 parse_compartment_config(struct CompConfig *);
 static struct CompEntryPointDef *
-make_default_comp_entry_point();
+make_default_comp_entry_point(void);
 static struct CompConfig *
-make_default_comp_config();
+make_default_comp_config(void);
 static struct CompEntryPointDef
 get_entry_point(char *, const struct CompConfig *);
 static void
-prepare_compartment_environ();
+prepare_compartment_environ(void);
 static void *
 prepare_compartment_args(char **args, struct CompEntryPointDef);
 
@@ -313,7 +313,7 @@ mapping_exec(struct CompMapping *to_exec, char *fn_name, char **fn_args_arr)
 }
 
 void
-clean_all_comps()
+clean_all_comps(void)
 {
     for (size_t i = 0; i < comps_count; ++i)
     {
@@ -489,7 +489,7 @@ get_entry_point(char *entry_point_fn, const struct CompConfig *cc)
 }
 
 static void
-prepare_compartment_environ()
+prepare_compartment_environ(void)
 {
     proc_env_ptr = malloc(max_env_sz);
     memset(proc_env_ptr, 0, max_env_sz);
@@ -556,7 +556,7 @@ prepare_compartment_args(char **args, struct CompEntryPointDef cep)
 }
 
 static struct CompEntryPointDef *
-make_default_comp_entry_point()
+make_default_comp_entry_point(void)
 {
     struct CompEntryPointDef *cep = malloc(sizeof(struct CompEntryPointDef));
     cep->name = malloc(strlen("main") + 1);
@@ -567,7 +567,7 @@ make_default_comp_entry_point()
 }
 
 static struct CompConfig *
-make_default_comp_config()
+make_default_comp_config(void)
 {
     struct CompConfig *cc = malloc(sizeof(struct CompConfig));
     cc->heap_size = DEFAULT_COMP_HEAP_SZ;
diff --git a/src/symbols_comp.c b/src/symbols_comp.c
@@ -41,7 +41,7 @@ comp_syms_print_one(void *sym)
  ******************************************************************************/
 
 comp_symbol_list *
-comp_syms_init()
+comp_syms_init(void)
 {
     comp_symbol_list *new_list = malloc(sizeof(comp_symbol_list));
     tommy_hashtable_init(new_list, HASHTABLE_MAX_SZ);
diff --git a/src/symbols_lib.c b/src/symbols_lib.c
@@ -42,7 +42,7 @@ lib_syms_print_one(void *sym)
  ******************************************************************************/
 
 lib_symbol_list *
-lib_syms_init()
+lib_syms_init(void)
 {
     lib_symbol_list *new_list = malloc(sizeof(lib_symbol_list));
     tommy_hashtable_init(new_list, HASHTABLE_MAX_SZ);
diff --git a/tests/compartment_harness.c b/tests/compartment_harness.c
@@ -58,7 +58,7 @@ cheri_offset_get(void *ptr)
 }
 
 void *
-cheri_ddc_get()
+cheri_ddc_get(void)
 {
     return 0x0;
 }
diff --git a/tests/lua_script.c b/tests/lua_script.c
@@ -6,7 +6,7 @@
 #include <lualib.h>
 
 int
-simple_val()
+simple_val(void)
 {
     return 42;
 }
@@ -30,7 +30,7 @@ do_script_arg(char *script_path)
 }
 
 int
-do_script()
+do_script(void)
 {
     lua_State *L = luaL_newstate();
     luaL_openlibs(L);
@@ -42,7 +42,7 @@ do_script()
 }
 
 int
-main()
+main(void)
 {
     do_script_arg("./hello_world.lua");
     return 0;
diff --git a/tests/lua_suite_some.c b/tests/lua_suite_some.c
@@ -7,7 +7,7 @@
 #include <lualib.h>
 
 int
-main()
+main(void)
 {
     const char *test_dir = "./lua";
     const char *test_names[] = { "strings.lua", "utf8.lua", "goto.lua",
diff --git a/tests/simple_const_thrloc_var.c b/tests/simple_const_thrloc_var.c
@@ -3,7 +3,7 @@
 _Thread_local const int *var;
 
 int
-main()
+main(void)
 {
     int v = 42;
     var = &v;
diff --git a/tests/simple_environ.c b/tests/simple_environ.c
@@ -6,7 +6,7 @@
 extern char **environ;
 
 int
-main()
+main(void)
 {
     size_t i = 0;
     for (char **curr_env = environ; *curr_env; ++curr_env)
diff --git a/tests/simple_fopen.c b/tests/simple_fopen.c
@@ -6,7 +6,7 @@
 #include <unistd.h>
 
 void
-by_fopen()
+by_fopen(void)
 {
     FILE *fd = fopen("tmp", "w");
     if (!fd)
@@ -17,7 +17,7 @@ by_fopen()
 }
 
 void
-by_syscall()
+by_syscall(void)
 {
     int fd = syscall(SYS_open, "tmp", O_CREAT); // open
     if (fd == -1)
@@ -28,7 +28,7 @@ by_syscall()
 }
 
 void
-by_open()
+by_open(void)
 {
     int fd = open("tmp", O_CREAT);
     if (fd == -1)
@@ -39,7 +39,7 @@ by_open()
 }
 
 int
-main()
+main(void)
 {
     write(STDOUT_FILENO, "== By open\n", 11);
     by_open();
diff --git a/tests/simple_fputs.c b/tests/simple_fputs.c
@@ -2,7 +2,7 @@
 #include <unistd.h>
 
 int
-main()
+main(void)
 {
     /*FILE* strem = __stdoutp;*/
     FILE *strem = fdopen(STDOUT_FILENO, "w");
diff --git a/tests/simple_global_var-external.c b/tests/simple_global_var-external.c
@@ -1,7 +1,7 @@
 static int ext_val;
 
 int
-get_ext_val()
+get_ext_val(void)
 {
     if (!ext_val)
     {
diff --git a/tests/simple_global_var.c b/tests/simple_global_var.c
@@ -1,7 +1,7 @@
 #include <assert.h>
 
 int
-get_ext_val();
+get_ext_val(void);
 
 int
 main(void)
diff --git a/tests/simple_static_var.c b/tests/simple_static_var.c
@@ -3,7 +3,7 @@
 extern unsigned short fortytwo;
 
 int
-main()
+main(void)
 {
     assert(fortytwo == 42);
     return 0;
diff --git a/tests/simple_thrloc_var-external.c b/tests/simple_thrloc_var-external.c
@@ -6,20 +6,20 @@ _Thread_local static int ex_val_stat = 242;
 _Thread_local int from_int;
 
 int
-get_ext()
+get_ext(void)
 {
     ex_val = 420;
     return ex_val;
 }
 
 int
-get_ext_stat()
+get_ext_stat(void)
 {
     return ex_val_stat;
 }
 
 void
-use_val()
+use_val(void)
 {
     ex_val_used = 24;
     assert(ex_val_used == 24);
diff --git a/tests/simple_thrloc_var.c b/tests/simple_thrloc_var.c
@@ -8,16 +8,16 @@ _Thread_local static long val4 = LONG_MAX;
 _Thread_local long val5;
 
 int
-get_ext();
+get_ext(void);
 int
-get_ext_stat();
+get_ext_stat(void);
 void
-use_val();
+use_val(void);
 void
 do_ext_check(int);
 
 int
-do_val2()
+do_val2(void)
 {
     assert(val2 == 4242);
     return val2;
diff --git a/tests/simple_toupper.c b/tests/simple_toupper.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 
 int
-main()
+main(void)
 {
     char x = 'x';
     printf("UPPER == %c\n", toupper(x));
diff --git a/tests/simple_va_args.c b/tests/simple_va_args.c
@@ -18,7 +18,7 @@ sum(int count, ...)
 }
 
 int
-main()
+main(void)
 {
     int suman = sum(3, 15, 30, -3);
     assert(suman == 42);
diff --git a/tests/so_harness.c b/tests/so_harness.c
diff --git a/tests/test_ddc_overwrite.c b/tests/test_ddc_overwrite.c
diff --git a/tests/test_map.c b/tests/test_map.c
diff --git a/tests/test_map_multi.c b/tests/test_map_multi.c
diff --git a/tests/test_two_comps-comp1.c b/tests/test_two_comps-comp1.c
diff --git a/tests/test_two_comps-comp2.c b/tests/test_two_comps-comp2.c
diff --git a/tests/tls_check.c b/tests/tls_check.c

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#define __capability`
`5`	`5`
`6`	`6`	`void *`
`7`		`-cheri_ddc_get()`
	`7`	`+cheri_ddc_get(void)`
`8`	`8`	`{`
`9`	`9`	`return NULL;`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ reallocarray(void *to_realloc, size_t elem_count, size_t elem_size)`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`void`
`212`		`-tls_lookup_stub()`
	`212`	`+tls_lookup_stub(void)`
`213`	`213`	`{`
`214`	`214`	`// Get TLS index`
`215`	`215`	`// TODO works only for one TLS region`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ void *__capability sealed_redirect_cap;`
`17`	`17`	`* this is the only component visible to the compartments`
`18`	`18`	`*/`
`19`	`19`	`void`
`20`		`-setup_intercepts()`
	`20`	`+setup_intercepts(void)`
`21`	`21`	`{`
`22`	`22`	`sealed_redirect_cap = manager_ddc;`
`23`	`23`	`sealed_redirect_cap`