Merge branch 'dev' of github.com:qilingframework/qiling into dev

Author: xwings

qiling/os/linux/syscall.py

@@ -19,6 +19,17 @@ class timespec(ctypes.Structure):
 
     _pack_ = 8
 
+
+# Temporary dirty fix.
+# TODO: Pack ctypes.Structure according to ql.archtype and ql.ostype?
+class timespec32(ctypes.Structure):
+    _fields_ = [
+        ("tv_sec", ctypes.c_uint32),
+        ("tv_nsec", ctypes.c_int32)
+    ]
+
+    _pack_ = 4
+
 def ql_syscall_set_thread_area(ql: Qiling, u_info_addr, *args, **kw):
     if ql.archtype == QL_ARCH.X86:
         GDT_ENTRY_TLS_MIN = 12
@@ -64,7 +75,10 @@ def ql_syscall_clock_gettime(ql, clock_gettime_clock_id, clock_gettime_timespec,
     now = datetime.now().timestamp()
     tv_sec = floor(now)
     tv_nsec = floor((now - floor(now)) * 1e6)
-    tp = timespec(tv_sec= tv_sec, tv_nsec=tv_nsec)
+    if ql.archtype == QL_ARCH.X8664:
+        tp = timespec(tv_sec= tv_sec, tv_nsec=tv_nsec)
+    else:
+        tp = timespec32(tv_sec= tv_sec, tv_nsec=tv_nsec)
     ql.mem.write(clock_gettime_timespec, bytes(tp))
 
     ql.log.debug("clock_gettime(clock_id = %d, timespec = 0x%x)" % (clock_gettime_clock_id, clock_gettime_timespec))
@@ -75,7 +89,10 @@ def ql_syscall_gettimeofday(ql, gettimeofday_tv, gettimeofday_tz, *args, **kw):
     now = datetime.now().timestamp()
     tv_sec = floor(now)
     tv_nsec = floor((now - floor(now)) * 1e6)
-    tp = timespec(tv_sec= tv_sec, tv_nsec=tv_nsec)
+    if ql.archtype == QL_ARCH.X8664:
+        tp = timespec(tv_sec= tv_sec, tv_nsec=tv_nsec)
+    else:
+        tp = timespec32(tv_sec= tv_sec, tv_nsec=tv_nsec)
 
     if gettimeofday_tv != 0:
         ql.mem.write(gettimeofday_tv, bytes(tp))

qiling/os/posix/const.py

@@ -541,3 +541,13 @@
     130: 'EOWNERDEAD',
     131: 'ENOTRECOVERABLE',
 }
+
+# shm syscall
+IPC_CREAT = 8**3
+IPC_EXCL = 2*(8**3)
+IPC_NOWAIT = 4*(8**3)
+
+SHM_RDONLY = 8**4
+SHM_RND = 2*(8**4)
+SHM_REMAP= 4*(8**4)
+SHM_EXEC = 1*(8**5)

qiling/os/posix/posix.py

@@ -104,6 +104,8 @@ def __init__(self, ql: Qiling):
         self._fd[1] = self.stdout
         self._fd[2] = self.stderr
 
+        self._shms = {}
+
     # ql.syscall - get syscall for all posix series
     @property
     def syscall(self):

qiling/os/posix/syscall/mman.py

@@ -182,3 +182,28 @@ def ql_syscall_mmap(ql, mmap_addr, mmap_length, mmap_prot, mmap_flags, mmap_fd,
 
 def ql_syscall_mmap2(ql, mmap2_addr, mmap2_length, mmap2_prot, mmap2_flags, mmap2_fd, mmap2_pgoffset):
     return syscall_mmap_impl(ql, mmap2_addr, mmap2_length, mmap2_prot, mmap2_flags, mmap2_fd, mmap2_pgoffset, 2)
+
+def ql_syscall_shmget(ql, key, size, shmflg, *args, **kwargs):
+    if (shmflg & IPC_CREAT) == 0:
+        if key not in ql.os._shms:
+            return ENOENT
+    else:
+        if (shmflg & IPC_EXCL) != 0:
+            if key in ql.os._shms:
+                return EEXIST
+        else:
+            #addr = ql.mem.map_anywhere(size)
+            ql.os._shms[key] = (key, size)
+            return key
+
+def ql_syscall_shmat(ql, shmid, shmaddr, shmflg, *args, **kwargs):
+    # shmid == key
+    # dummy implementation
+    if shmid not in ql.os._shms:
+        return EINVAL
+    key, size = ql.os._shms[shmid]
+    if shmaddr == 0:
+        addr = ql.mem.map_anywhere(size)
+    else:
+        addr = ql.mem.map(shmaddr, size, info="[shm]")
+    return addr