!1981 修复seccomp的脚本工具

Merge pull request !1981 from 夏不白/fix_seccomp_tool

services/modules/seccomp/scripts/tools/audit_log_analysis.py

@@ -59,7 +59,7 @@ def get_item_content(name_nr_table, arch_nr_table):
             syscall_name_dict.get('arm').remove(func_name)
         else:
             content = '{}{};arm64\n'.format(content, func_name)
-    if not syscall_name_dict.get('arm'):
+    if syscall_name_dict.get('arm'):
         content = '{}{};arm\n'.format(content, ';arm\n'.join(
                   [func_name for func_name in syscall_name_dict.get('arm')]))
 

services/modules/seccomp/scripts/tools/collect_elf_syscall.py

@@ -67,7 +67,7 @@ def get_lib_path(elf_path, elf_name, cmd_extra):
     grep_unstrip = ' | grep unstripped | grep -v _x64 {}'.format(cmd_extra)
 
     if elf_name == 'libc++.so':
-        grep_unstrip = ''
+        grep_unstrip = '| grep aarch64-linux'
     cmd = 'find {} -name {}{}'.format(elf_path, elf_name, grep_unstrip) 
     result_list = os.popen(cmd).read().split('\n')
     result = result_list[0].strip()
@@ -281,9 +281,9 @@ def get_function_name_nr_table(src_syscall_path):
 
 def collect_concrete_syscall(args):
     if args.target_cpu == 'arm64':
-        arch_str = 'aarch64'
+        arch_str = 'aarch64-linux'
     elif args.target_cpu == 'arm':
-        arch_str = 'arm'
+        arch_str = 'arm-linux'
     libc_path = get_lib_path(args.src_elf_path, 'libc.so', ' | grep ' + arch_str)
     libc_asm_path = generate_libc_asm(args.target_cpu, libc_path, '.')
 

services/modules/seccomp/scripts/tools/libc_static_analysis.py

@@ -61,6 +61,8 @@ def remove_head_zero(addr):
 
 def line_find_syscall_nr(line, nr_set, nr_last):
     nr = nr_last
+    is_find_nr = False
+    is_find_svc = True
     if ';' in line:
         nr_tmp, is_digit = gen_policy.str_convert_to_int(line[line.find('0x'):])
     else: