Update both 32 and 64 bit statx

Author: cla7aye15I4nd

qiling/os/posix/syscall/stat.py

@@ -1146,14 +1146,54 @@ def ql_syscall_stat(ql: Qiling, path: int, buf_ptr: int):
 def ql_syscall_stat64(ql: Qiling, path: int, buf_ptr: int):
     return statFamily(ql, path, buf_ptr, "stat64", Stat, pack_stat64_struct)
 
-class StatxTimestamp(ctypes.Structure):
+class StatxTimestamp32(ctypes.Structure):
+    _fields_ = [
+        ('tv_sec', ctypes.c_int32),
+        ('tv_nsec', ctypes.c_uint32),
+        ('__statx_timestamp_pad1', ctypes.c_int32)
+    ]
+
+class Statx32(ctypes.Structure):
+    """ 
+        Reference:
+         - https://man7.org/linux/man-pages/man2/statx.2.html
+         - https://code.woboq.org/userspace/glibc/sysdeps/unix/sysv/linux/statx.c.html
+
+    """
+    _fields_ = [
+        ('stx_mask', ctypes.c_uint32),
+        ('stx_blksize', ctypes.c_uint32),
+        ('stx_attributes', ctypes.c_uint32),
+        ('stx_nlink', ctypes.c_uint32),
+        ('stx_uid', ctypes.c_uint32),
+        ('stx_gid', ctypes.c_uint32),
+        ('stx_mode', ctypes.c_uint16),
+        ('__statx_pad1', ctypes.c_uint16),
+        ('stx_ino', ctypes.c_uint32),
+        ('stx_size', ctypes.c_uint32),
+        ('stx_blocks', ctypes.c_uint32),
+        ('stx_attributes_mask', ctypes.c_uint32),
+        ('stx_atime', StatxTimestamp32),
+        ('stx_btime', StatxTimestamp32),
+        ('stx_ctime', StatxTimestamp32),
+        ('stx_mtime', StatxTimestamp32),
+        ('stx_rdev_major', ctypes.c_uint32),
+        ('stx_rdev_minor', ctypes.c_uint32),
+        ('stx_dev_major', ctypes.c_uint32),
+        ('stx_dev_minor', ctypes.c_uint32),
+        ('__statx_pad2', ctypes.c_uint32 * 14),
+    ]
+
+    _pack_ = 8
+
+class StatxTimestamp64(ctypes.Structure):
     _fields_ = [
         ('tv_sec', ctypes.c_int64),
         ('tv_nsec', ctypes.c_uint32),
         ('__statx_timestamp_pad1', ctypes.c_int32)
     ]
 
-class Statx(ctypes.Structure):
+class Statx64(ctypes.Structure):
     """ 
         Reference:
          - https://man7.org/linux/man-pages/man2/statx.2.html
@@ -1173,27 +1213,31 @@ class Statx(ctypes.Structure):
         ('stx_size', ctypes.c_uint64),
         ('stx_blocks', ctypes.c_uint64),
         ('stx_attributes_mask', ctypes.c_uint64),
-        ('stx_atime', StatxTimestamp),
-        ('stx_btime', StatxTimestamp),
-        ('stx_ctime', StatxTimestamp),
-        ('stx_mtime', StatxTimestamp),
+        ('stx_atime', StatxTimestamp64),
+        ('stx_btime', StatxTimestamp64),
+        ('stx_ctime', StatxTimestamp64),
+        ('stx_mtime', StatxTimestamp64),
         ('stx_rdev_major', ctypes.c_uint32),
         ('stx_rdev_minor', ctypes.c_uint32),
         ('stx_dev_major', ctypes.c_uint32),
         ('stx_dev_minor', ctypes.c_uint32),
         ('__statx_pad2', ctypes.c_uint64 * 14),
     ]
 
-    _pack_ = 8
+    _pack_ = 4
 
 # int statx(int dirfd, const char *restrict pathname, int flags,
 #                  unsigned int mask, struct statx *restrict statxbuf);
 def ql_syscall_statx(ql: Qiling, dirfd: int, path: int, flags: int, mask: int, buf_ptr: int):
     def statx_convert_timestamp(tv_sec, tv_nsec):
-        return StatxTimestamp(
-            tv_sec  = struct.unpack('i', struct.pack('f', tv_sec))[0],
-            tv_nsec = struct.unpack('i', struct.pack('f', tv_nsec))[0],
-        )
+        tv_sec  = struct.unpack('i', struct.pack('f', tv_sec))[0]
+        tv_nsec = struct.unpack('i', struct.pack('f', tv_nsec))[0]
+
+        if ql.archbit == 32:
+            return StatxTimestamp32(tv_sec=tv_sec, tv_nsec=tv_nsec)
+        else:
+            return StatxTimestamp64(tv_sec=tv_sec, tv_nsec=tv_nsec)
+
 
     def major(dev):
         return ((dev >> 8) & 0xfff) | ((dev >> 32) & ~0xfff)
@@ -1209,6 +1253,11 @@ def minor(dev):
         else:
             st = Stat(real_path, fd)
 
+        if ql.archbit == 32:
+            Statx = Statx32
+        else:
+            Statx = Statx64
+
         stx = Statx(
             stx_mask = 0x07ff, # STATX_BASIC_STATS
             stx_blksize = st.st_blksize,