Merge pull request #614 from nullableVoidPtr/syscall

Simplify syscall errno

Author: xwings

examples/hello_arm_linux_custom_syscall.py

@@ -23,7 +23,7 @@ def my_syscall_write(ql, write_fd, write_buf, write_count, *args, **kw):
         if ql.output in (QL_OUTPUT.DEBUG, QL_OUTPUT.DUMP):
             raise
 
-    ql.os.definesyscall_return(regreturn)
+    return regreturn
 
 
 if __name__ == "__main__":

examples/netgear_6220_mips32el_linux.py

@@ -23,9 +23,9 @@
 
 def my_syscall_write(ql, write_fd, write_buf, write_count, *rest):
     if write_fd == 2 and ql.os.fd[2].__class__.__name__ == 'ql_pipe':
-        ql.os.definesyscall_return(-1)
+        return -1
     else:
-        syscall.ql_syscall_write(ql, write_fd, write_buf, write_count, *rest)
+        return syscall.ql_syscall_write(ql, write_fd, write_buf, write_count, *rest)
 
 
 def my_bind(ql, *args, **kw):

examples/tendaac1518_httpd.py

@@ -55,7 +55,7 @@ def nvram_listener():
 def myvfork(ql):
     regreturn = 0
     logging.info("vfork() = %d" % regreturn)
-    ql.os.definesyscall_return(regreturn)
+    return regreturn
 
 
 def my_sandbox(path, rootfs):

qiling/os/freebsd/syscall.py

@@ -7,15 +7,14 @@
 
 def ql_syscall_clock_gettime(ql, clock_gettime_clock_id, clock_gettime_timespec, *args, **kw):
     logging.info("clock_gettime()")
-    regreturn = 0
-    ql.os.definesyscall_return(regreturn)
+    return 0
 
 
 def ql_syscall_sysarch(ql, op, parms, *args, **kw):
     """
     wild guess, of cause not working
     """
-    
+
     regreturn = 0
     ql.GS_SEGMENT_ADDR = 0x6000
     ql.GS_SEGMENT_SIZE = 0x8000
@@ -28,4 +27,4 @@ def ql_syscall_sysarch(ql, op, parms, *args, **kw):
     #op_buf = ql.pack32(op)
     #ql.mem.write(parms, op_buf)
     logging.info("sysarch(0x%x,0x%x) = %i" % (op, parms, regreturn))
-    ql.os.definesyscall_return(regreturn)
+    return regreturn

qiling/os/linux/syscall.py

@@ -38,13 +38,12 @@ def ql_syscall_set_thread_area(ql, u_info_addr, *args, **kw):
             index = ql.os.gdtm.get_free_idx(12)
 
         if index == -1 or index < 12 or index > 14:
-            regreturn = -1 
+            return -1
         else:
             ql.os.gdtm.register_gdt_segment(index, base, limit, QL_X86_A_PRESENT | QL_X86_A_DATA | QL_X86_A_DATA_WRITABLE | QL_X86_A_PRIV_3 | QL_X86_A_DIR_CON_BIT, QL_X86_S_GDT | QL_X86_S_PRIV_3)
             ql.mem.write(u_info_addr, ql.pack32(index))
-            regreturn = 0
-        ql.os.definesyscall_return(regreturn)
-    
+            return 0
+
     elif ql.archtype == QL_ARCH.MIPS:
         CONFIG3_ULR = (1 << 13)
         ql.reg.cp0_config3 = CONFIG3_ULR

qiling/os/macos/syscall.py

@@ -63,17 +63,17 @@ def ql_syscall_fgetattrlist(ql, fd, alist, attributeBuffer, bufferSize, options,
 
     if len(attr) > bufferSize:
         logging.debug("Length error")
-        ql.os.definesyscall_return(1)
+        return 1
     else:
 
         ql.mem.write(attributeBuffer, attr)
         #set_eflags_cf(ql, 0x0)
-        ql.os.definesyscall_return(KERN_SUCCESS)
+        return KERN_SUCCESS
 
 
 def ql_syscall_poll(ql, target, address, size, *args, **kw):
-    ql.os.definesyscall_return(KERN_SUCCESS)
     logging.info("pool()")
+    return KERN_SUCCESS
 
 
 ################
@@ -90,12 +90,12 @@ def ql_syscall_kernelrpc_mach_vm_allocate_trap(ql, port, addr, size, flags, *arg
     ql.os.macho_task.min_offset = mmap_end
     logging.debug("[+] vm alloc form 0x%x to 0x%0x" % (mmap_address, mmap_end))
     ql.mem.write(addr, struct.pack("<Q", mmap_address))
-    ql.os.definesyscall_return(0)
+    return 0
 
 # 0xc
 def ql_syscall_kernelrpc_mach_vm_deallocate_trap(ql, target, address, size, *args, **kw):
-    ql.os.definesyscall_return(KERN_SUCCESS)
     logging.debug("[+] [mach] mach vm deallocate trap")
+    return KERN_SUCCESS
 
 # 0xf
 def ql_syscall_kernelrpc_mach_vm_map_trap(ql, target, address, size, mask, flags, cur_protection):
@@ -114,7 +114,7 @@ def ql_syscall_kernelrpc_mach_vm_map_trap(ql, target, address, size, mask, flags
     ql.os.macho_vmmap_end = vmmap_end
     ql.mem.map(vmmap_address, vmmap_end - vmmap_address)
     ql.mem.write(address, struct.pack("<Q", vmmap_address))
-    ql.os.definesyscall_return(KERN_SUCCESS)
+    return KERN_SUCCESS
 
 # 0x12
 def ql_syscall_kernelrpc_mach_port_deallocate_trap(ql, *args, **kw):
@@ -136,26 +136,26 @@ def ql_syscall_kernelrpc_mach_port_construct_trap(ql, target, options, context,
 
 # 0x1a
 def ql_syscall_mach_reply_port(ql, *args, **kw):
-    ql.os.definesyscall_return(ql.os.macho_mach_port.name)
     logging.debug("[+] [mach] mach reply port , ret: %s" % (ql.os.macho_mach_port.name))
+    return ql.os.macho_mach_port.name
 
 # 0x1b
 def ql_syscall_thread_self_trap(ql, *args, **kw):
     port_manager = ql.os.macho_port_manager
     thread_port = port_manager.get_thread_port(ql.os.macho_thread)
     logging.debug("[+] [mach] thread_self_trap: ret: %s" % (thread_port))
-    ql.os.definesyscall_return(thread_port)
+    return thread_port
 
 # 0x1c
 def ql_syscall_task_self_trap(ql, *args, **kw):
-    ql.os.definesyscall_return(ql.os.macho_task.id)
     logging.debug("[+] [mach] task self trap, ret: %d" % (ql.os.macho_task.id))
+    return ql.os.macho_task.id
 
 # 0x1d
 def ql_syscall_host_self_trap(ql, *args, **kw):
     port_manager = ql.os.macho_port_manager
-    ql.os.definesyscall_return(port_manager.host_port.name)
-    logging.debug("[+] [mach] host_self_trap, ret: %s" % (666))
+    logging.debug("[+] [mach] host_self_trap, ret: %s" % (ql.os.macho_port_manager.host_port.name))
+    return port_manager.host_port.name
 
 # 0x1f
 def ql_syscall_mach_msg_trap(ql, args, opt, ssize, rsize, rname, timeout):
@@ -165,7 +165,7 @@ def ql_syscall_mach_msg_trap(ql, args, opt, ssize, rsize, rname, timeout):
     mach_msg.read_msg_from_mem(args, ssize)
     logging.debug("[+] Recv-> Header: %s, Content: %s" % (mach_msg.header, mach_msg.content))
     ql.os.macho_port_manager.deal_with_msg(mach_msg, args)
-    ql.os.definesyscall_return(0)
+    return 0
 
 
 #################
@@ -178,9 +178,9 @@ def ql_syscall_access_macos(ql, path, flags, *args, **kw):
     logging.info("access(%s, 0x%x)" % (path_str, flags))
     logging.debug("[+] access(path: %s, flags: 0x%x)" % (path_str, flags))
     if not ql.os.macho_fs.isexists(path_str):
-        ql.os.definesyscall_return(ENOENT)
+        return ENOENT
     else:
-        ql.os.definesyscall_return(KERN_SUCCESS)
+        return KERN_SUCCESS
 
 # 0x30 
 def ql_syscall_sigprocmask(ql, how, mask, omask, *args, **kw):
@@ -204,7 +204,7 @@ def ql_syscall_fcntl64_macos(ql, fcntl_fd, fcntl_cmd, fcntl_arg, *args, **kw):
         regreturn = 0
 
     logging.info("fcntl64(fd: %d, cmd: %d, arg: 0x%x) = %d" % (fcntl_fd, fcntl_cmd, fcntl_arg, regreturn))
-    ql.os.definesyscall_return(regreturn)
+    return regreturn
 
 # 0x99
 def ql_syscall_pread(ql, fd, buf, nbyte, offset, *args, **kw):
@@ -216,7 +216,7 @@ def ql_syscall_pread(ql, fd, buf, nbyte, offset, *args, **kw):
         data = ql.os.fd[fd].read(nbyte)
         ql.mem.write(buf, data)
     set_eflags_cf(ql, 0x0)
-    ql.os.definesyscall_return(nbyte)
+    return nbyte
 
 # 0xa9
 def ql_syscall_csops(ql, pid, ops, useraddr, usersize, *args, **kw):
@@ -225,7 +225,7 @@ def ql_syscall_csops(ql, pid, ops, useraddr, usersize, *args, **kw):
     logging.info("csops(pid: %d, ops: 0x%x, useraddr: 0x%x, usersize: 0x%x) flag: 0x%x" % (
         pid, ops, useraddr, usersize, ((CS_ENFORCEMENT | CS_GET_TASK_ALLOW))
     ))
-    ql.os.definesyscall_return(KERN_SUCCESS)
+    return KERN_SUCCESS
 
 # 0xdc
 def ql_syscall_getattrlist(ql, path, alist, attributeBuffer, bufferSize, options, *args, **kw):
@@ -264,11 +264,11 @@ def ql_syscall_getattrlist(ql, path, alist, attributeBuffer, bufferSize, options
 
     if len(attr) > bufferSize:
         logging.debug("Length error")
-        ql.os.definesyscall_return(1)
+        return 1
     else:
         ql.mem.write(attributeBuffer, attr)
         set_eflags_cf(ql, 0x0)
-        ql.os.definesyscall_return(KERN_SUCCESS)
+        return KERN_SUCCESS
 
 # 0xc2
 # struct rlimit {
@@ -282,7 +282,7 @@ def ql_syscall_getrlimit(ql, which, rlp, *args, **kw):
     RLIM_NLIMITS = 9
     which = which & _RLIMIT_POSIX_FLAG
     if which >= RLIM_NLIMITS:
-        ql.os.definesyscall_return(EINVAL)
+        return EINVAL
     else :
         ql.mem.write(rlp, b'\x00\x13\x00\x00\x00\x00\x00\x00')  # rlim_cur
         ql.mem.write(rlp, b'\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x7F')  # rlim_max
@@ -343,14 +343,14 @@ def ql_syscall_mmap2_macos(ql, mmap2_addr, mmap2_length, mmap2_prot, mmap2_flags
     regreturn = mmap_base
     logging.debug("[+] mmap_base is 0x%x" % regreturn)
 
-    ql.os.definesyscall_return(regreturn)
+    return regreturn
 
 # 0xca
 def ql_syscall_sysctl(ql, name, namelen, old, oldlenp, new_arg, newlen):
     logging.info("sysctl(name: 0x%x, namelen: 0x%x, old: 0x%x, oldlenp: 0x%x, new: 0x%x, newlen: 0x%x)" % (
         name, namelen, old, oldlenp, new_arg, newlen
     ))
-    ql.os.definesyscall_return(KERN_SUCCESS)
+    return KERN_SUCCESS
 
 # 0x112
 def ql_syscall_sysctlbyname(ql, name, namelen, old, oldlenp, new_arg, newlen):
@@ -360,14 +360,14 @@ def ql_syscall_sysctlbyname(ql, name, namelen, old, oldlenp, new_arg, newlen):
     logging.debug("[+] sysctlbyname(name: 0x%x, namelen: 0x%x, old: 0x%x, oldlenp: 0x%x, new: 0x%x, newlen: 0x%x)" % (
         name, namelen, old, oldlenp, new_arg, newlen
     ))
-    ql.os.definesyscall_return(KERN_SUCCESS)
+    return KERN_SUCCESS
 
 # 0x126
 # check shared region if avalible , return not ready every time
 def ql_syscall_shared_region_check_np(ql, p, uap, retvalp, *args, **kw):
     logging.info("shared_region_check_np(0x%x, 0x%x, 0x%x) =  0x%x" % (p, uap, retvalp, EINVAL))
     logging.debug("[+] shared_region_check_np(p: 0x%x, uap: 0x%x, retvalp: 0x%x) = 0x%x" % (p, uap, retvalp, EINVAL))
-    ql.os.definesyscall_return(EINVAL)
+    return EINVAL
 
 # 0x150
 def ql_syscall_proc_info(ql, callnum, pid, flavor, arg, buff, buffer_size):
@@ -436,7 +436,7 @@ def ql_syscall_stat64_macos(ql, stat64_pathname, stat64_buf_ptr, *args, **kw):
         logging.debug("[+] stat64 write completed")
     else:
         logging.debug("[!] stat64 read/write fail")
-    ql.os.definesyscall_return(regreturn)
+    return regreturn
 
 # 0x153
 def ql_syscall_fstat64_macos(ql, fstat64_fd, fstat64_add, *args, **kw):
@@ -502,18 +502,18 @@ def ql_syscall_fstat64_macos(ql, fstat64_fd, fstat64_add, *args, **kw):
         logging.debug("[+] fstat64 write completed")
     else:
         logging.debug("[!] fstat64 read/write fail")
-    ql.os.definesyscall_return(regreturn)
+    return regreturn
 
 # 0x16e
 def ql_syscall_bsdthread_register(ql, threadstart, wqthread, flags, stack_addr_hint, targetconc_ptr, dispatchqueue_offset):
     set_eflags_cf(ql, 0x0)
-    ql.os.definesyscall_return(0x00000000400000df)
+    return 0x00000000400000df
 
 # 0x174
 def ql_syscall_thread_selfid(ql, *args, **kw):
     thread_id = ql.os.macho_thread.id
     logging.info("thread_selfid() = %d" % (thread_id))
-    ql.os.definesyscall_return(thread_id)
+    return thread_id
 
 
 # 0x18d
@@ -574,7 +574,7 @@ def ql_syscall_open_nocancel(ql, filename, flags, mode, *args, **kw):
         logging.debug("[+] File Found: %s" % relative_path)
     else:
         logging.debug("[!] File Not Found %s" % relative_path)
-    ql.os.definesyscall_return(regreturn)
+    return regreturn
 
 # 0x1b6
 def ql_syscall_shared_region_map_and_slide_np(ql, fd, count, mappings_addr, slide, slide_start, slide_size):
@@ -593,19 +593,19 @@ def ql_syscall_shared_region_map_and_slide_np(ql, fd, count, mappings_addr, slid
         ql.mem.write(mapping.sfm_address, content)
         mappings_addr += mapping.size
         mapping_list.append(mapping)
-    ql.os.definesyscall_return(slide_size)
+    return slide_size
 
 # 0x1e3
 def ql_syscall_csrctl(ql, op, useraddr, usersize, *args, **kw):
     logging.info("csrctl(0x%x, 0x%x, 0x%x)" % (op, useraddr, usersize))
     logging.debug("csrctl(op: 0x%x, useraddr :0x%x, usersize: 0x%x)" % (op, useraddr, usersize))
-    ql.os.definesyscall_return(1)
+    return 1
 
 # 0x1f4
 def ql_syscall_getentropy(ql, buffer, size, *args, **kw):
     logging.info("getentropy(0x%x, 0x%x)" % (buffer, size))
     logging.debug("[+] getentropy(buffer: 0x%x, size: 0x%x)" % (buffer, size))
-    ql.os.definesyscall_return(KERN_SUCCESS)
+    return KERN_SUCCESS
 
 # 0x208
 def ql_syscall_terminate_with_payload(ql, pid, reason_namespace, reason_code, payload, payload_size, reason_string):
@@ -615,9 +615,9 @@ def ql_syscall_terminate_with_payload(ql, pid, reason_namespace, reason_code, pa
     logging.debug("[+] terminate_with_payload(pid: %d, reason_namespace: 0x%x, reason_code: 0x%x, payload: 0x%x \
             payload_size: 0x%x, reason_string: 0x%x)" % (pid, reason_namespace, reason_code,
             payload, payload_size, reason_string))
-    ql.os.definesyscall_return(KERN_SUCCESS)
     ql.emu_stop()
     raise QlErrorSyscallError("[!] Exit with Error")
+    return KERN_SUCCESS
 
 # 0x209
 def ql_syscall_abort_with_payload(ql, reason_namespace, reason_code, payload, payload_size, reason_string, reason_flags):
@@ -626,7 +626,7 @@ def ql_syscall_abort_with_payload(ql, reason_namespace, reason_code, payload, pa
 
     logging.debug("[+] abort_with_payload(reason_namespace: 0x%x, reason_code: 0x%x, payload: 0x%x, payload_size: 0x%x, reason_string: 0x%x,\
             reason_flags: 0x%x)" % (reason_namespace, reason_code, payload, payload_size, reason_string, reason_flags))
-    ql.os.definesyscall_return(KERN_SUCCESS)
+    return KERN_SUCCESS
 
 
 
@@ -639,5 +639,4 @@ def ql_syscall_abort_with_payload(ql, reason_namespace, reason_code, payload, pa
 def ql_syscall_thread_fast_set_cthread_self64(ql, u_info_addr, *args, **kw):
     logging.debug("[+] [mdep] thread fast set cthread self64(tsd_base:0x%x)" % (u_info_addr))
     ql.reg.msr(GSMSR, u_info_addr)
-    ql.os.definesyscall_return(KERN_SUCCESS)
-    return 
+    return KERN_SUCCESS

qiling/os/posix/posix.py

@@ -162,15 +162,17 @@ def load_syscall(self, intno=None):
             self.syscalls_counter += 1
 
             try:                
-                if self.syscall_onEnter == None:
+                if self.syscall_onEnter is None:
                     ret = 0
                 else:
                     ret = self.syscall_onEnter(self.ql, self.get_func_arg()[0], self.get_func_arg()[1], self.get_func_arg()[2], self.get_func_arg()[3], self.get_func_arg()[4], self.get_func_arg()[5])
 
                 if isinstance(ret, int) == False or ret & QL_CALL_BLOCK == 0:
-                    self.syscall_map(self.ql, self.get_func_arg()[0], self.get_func_arg()[1], self.get_func_arg()[2], self.get_func_arg()[3], self.get_func_arg()[4], self.get_func_arg()[5])
-                
-                if self.syscall_onExit != None:
+                    ret = self.syscall_map(self.ql, self.get_func_arg()[0], self.get_func_arg()[1], self.get_func_arg()[2], self.get_func_arg()[3], self.get_func_arg()[4], self.get_func_arg()[5])
+                    if ret is not None and isinstance(ret, int):
+                        self.set_syscall_return(ret)
+
+                if self.syscall_onExit is not None:
                     self.syscall_onExit(self.ql, self.get_func_arg()[0], self.get_func_arg()[1], self.get_func_arg()[2], self.get_func_arg()[3], self.get_func_arg()[4], self.get_func_arg()[5])
 
             except KeyboardInterrupt:
@@ -203,7 +205,7 @@ def get_syscall(self):
 
         return self.ql.reg.read(syscall_num)
 
-    def definesyscall_return(self, regreturn):
+    def set_syscall_return(self, regreturn):
         # each name has a list of calls, we want the last one and we want to update the return value
         self.syscalls[self.syscall_name][-1]["result"] = regreturn
         if self.ql.archtype == QL_ARCH.ARM:  # ARM