Merge branch 'dev' into riscv

Author: cla7aye15I4nd

AUTHORS.TXT

@@ -14,16 +14,20 @@ NGUYEN Anh Quynh <[email protected]>
 Core Developers Crew
 ====================
 Earl MARCUS (klks84) [email protected]
-DING tianze (D1iv3) <[email protected]>
-SUN bowen (w1tcher) <[email protected]>
-CHEN huitao (null) <[email protected]>
-YU tong (sp1ke) <[email protected]>
 WU chenxu (kabeor) <[email protected]>
 KONG ziqiao (lazymio) <[email protected]>
 YU zheng (dataisland) <[email protected]>
 Eli Cohen Nehemia (elicn) <[email protected]>
 
 
+Legacy Core Developers
+======================
+DING tianze (D1iv3) <[email protected]>
+SUN bowen (w1tcher) <[email protected]>
+CHEN huitao (null) <[email protected]>
+YU tong (sp1ke) <[email protected]>
+
+
 Travis, Website and Documentations
 ==================================
 FOO Kevin (chfl4gs) <[email protected]>

CREDITS.TXT

@@ -3,14 +3,15 @@ This file details the changelog of Qiling Framework.
 ------------------------------------
 [Version 1.4.1]: Nov Xth, 2021
 
-- Clean and tidy up core utils module (WIP)
-- Clean and tidy up path module
-- Other small adjustments so support the above changes
-- Rearranged the code to be more Pythonic and more readable
-- Removed unused members and methods
-- Added typing annotations
-- Added ql.platform_os and ql.platform_arch
-- update ql.os.posix.const_mapping with more os/arch match
+New features:
+- Introduced riscv, both 32 and 64 (#980)
+
+Improvements:
+- Refactored core hooks (#966)
+- update ql.os.posix.const_mapping with more os/arch match (#973)
+- Minor refactor on ql.interpreter and ql.baremetal (#975)
+- More update in MCU modules (#971)
+- Fix getpeername and getsockname syscalls (#986)
 
 
 ------------------------------------

ChangeLog

@@ -122,7 +122,7 @@ def __init__(
                 self._ostype = arch_os_convert(self._archtype)
             else:
                 self._ostype = ostype_convert(self._ostype.lower())
-
+                    
             if self._code == None:
                 self._code = "qilingcode"
             if self._argv is None:
@@ -157,9 +157,6 @@ def __init__(
 
             if not ql_is_valid_arch(self._archtype):
                 raise QlErrorArch("Invalid Arch %s" % self._archtype)
-
-
-         
 
         #######################################
         # Loader and General Purpose OS check #

qiling/core.py

@@ -338,37 +338,49 @@ def ql_syscall_bind(ql: Qiling, bind_fd, bind_addr, bind_addrlen):
     return regreturn
 
 
-def ql_syscall_getsockname(ql: Qiling, sockfd, addr, addrlenptr):
-    if 0 <= sockfd < NR_OPEN and ql.os.fd[sockfd] != 0:
-        host, port = ql.os.fd[sockfd].getsockname()
-        data = struct.pack("<h", int(ql.os.fd[sockfd].family))
-        data += struct.pack(">H", port)
-        data += ipaddress.ip_address(host).packed
-        addrlen = ql.mem.read(addrlenptr, 4)
-        addrlen = ql.unpack32(addrlen)
-        data = data[:addrlen]
-        ql.mem.write(addr, data)
-        regreturn = 0
+def ql_syscall_getsockname(ql: Qiling, sockfd: int, addr: int, addrlenptr: int):
+    if 0 <= sockfd < NR_OPEN:
+        socket = ql.os.fd[sockfd]
+
+        if isinstance(socket, ql_socket):
+            host, port = socket.getpeername()
+
+            data = struct.pack("<h", int(socket.family))
+            data += struct.pack(">H", port)
+            data += ipaddress.ip_address(host).packed
+
+            addrlen = ql.mem.read_ptr(addrlenptr)
+
+            ql.mem.write(addr, data[:addrlen])
+            regreturn = 0
+        else:
+            regreturn = -EPERM
     else:
-        regreturn = -1
+        regreturn = -EPERM
 
     ql.log.debug("getsockname(%d, 0x%x, 0x%x) = %d" % (sockfd, addr, addrlenptr, regreturn))
     return regreturn
 
 
-def ql_syscall_getpeername(ql: Qiling, sockfd, addr, addrlenptr):
-    if 0 <= sockfd < NR_OPEN and ql.os.fd[sockfd] != 0:
-        host, port = ql.os.fd[sockfd].getpeername()
-        data = struct.pack("<h", int(ql.os.fd[sockfd].family))
-        data += struct.pack(">H", port)
-        data += ipaddress.ip_address(host).packed
-        addrlen = ql.mem.read(addrlenptr, 4)
-        addrlen = ql.unpack32(addrlen)
-        data = data[:addrlen]
-        ql.mem.write(addr, data)
-        regreturn = 0
+def ql_syscall_getpeername(ql: Qiling, sockfd: int, addr: int, addrlenptr: int):
+    if 0 <= sockfd < NR_OPEN:
+        socket = ql.os.fd[sockfd]
+
+        if isinstance(socket, ql_socket):
+            host, port = socket.getpeername()
+
+            data = struct.pack("<h", int(socket.family))
+            data += struct.pack(">H", port)
+            data += ipaddress.ip_address(host).packed
+
+            addrlen = ql.mem.read_ptr(addrlenptr)
+
+            ql.mem.write(addr, data[:addrlen])
+            regreturn = 0
+        else:
+            regreturn = -EPERM
     else:
-        regreturn = -1
+        regreturn = -EPERM
 
     ql.log.debug("getpeername(%d, 0x%x, 0x%x) = %d" % (sockfd, addr, addrlenptr, regreturn))
     return regreturn

qiling/os/posix/syscall/socket.py

@@ -145,8 +145,6 @@ def ql_syscall_lseek(ql: Qiling, fd: int, offset: int, lseek_origin: int):
             regreturn = ql.os.fd[fd].lseek(offset, lseek_origin)
         except OSError:
             regreturn = -1
-        else:
-            regreturn = 0
     else:
         regreturn = -EBADF