diff --git a/scripts/param_cfg_to_code.py b/scripts/param_cfg_to_code.py index edb8e7d7e2416fe69dadfa4b94b06b39dd3f1db4..50c9ee5eba197db76bd0f091460f146699e58df0 100755 --- a/scripts/param_cfg_to_code.py +++ b/scripts/param_cfg_to_code.py @@ -144,7 +144,8 @@ def main(): for source in args.source: print("source {}".format(out_dir)) - assert os.path.exists(source) + if not os.path.exists(source): + raise FileNotFoundError src_dict = get_param_from_cfg(source) dst = "".join([out_dir, "param_cfg.h"]) diff --git a/services/init/init_common_service.c b/services/init/init_common_service.c index 1ed3a9582d5da36bb72ca26cabfa20c0c57a17c2..f6d25a5020b8bb48a5a0d6262ed713dd9f52af01 100644 --- a/services/init/init_common_service.c +++ b/services/init/init_common_service.c @@ -474,7 +474,7 @@ static void CheckServiceSocket(Service *service) return; } -static void CheckOndemandService(service) +static void CheckOndemandService(Service *service) { CheckServiceSocket(service); if (strcmp(service->name, "console") == 0) { diff --git a/services/modules/seccomp/scripts/generate_code_from_policy.py b/services/modules/seccomp/scripts/generate_code_from_policy.py index 7eedb3fb8767a431d4ec4bb77781495f10012d29..ce71daa494848ebd76b15abc4381767f7f5aae8d 100755 --- a/services/modules/seccomp/scripts/generate_code_from_policy.py +++ b/services/modules/seccomp/scripts/generate_code_from_policy.py @@ -747,7 +747,8 @@ class SeccompPolicyParser: with open(args.dstfile, 'w') as output_file: output_file.write(content) - def filter_syscalls_nr(self, name_to_nr): + @staticmethod + def filter_syscalls_nr(name_to_nr): syscalls = {} for syscall_name, nr in name_to_nr.items(): if not syscall_name.startswith("__NR_") and not syscall_name.startswith("__ARM_NR_"): @@ -776,7 +777,7 @@ class SeccompPolicyParser: continue try: name = k.group(1) - nr = eval(mark_pattern.sub(lambda x: str(name_to_nr[x.group(0)]), + nr = eval(mark_pattern.sub(lambda x: str(name_to_nr.get(x.group(0))), k.group(2))) name_to_nr[name] = nr