Add support for setxattr and listxattr system calls with proper argument conversions

Author: celinehoang177

src/glibc/lind_syscall/lind_syscall_num.h

@@ -109,6 +109,8 @@
 #define STATFS_SYSCALL 137
 #define FSTATFS_SYSCALL 138
 #define GETHOSTNAME_SYSCALL 170
+#define SETXATTR_SYSCALL 188
+#define LISTXATTR_SYSCALL 194
 #define FUTEX_SYSCALL 202
 #define EPOLL_CREATE_SYSCALL 213
 #define CLOCK_GETTIME_SYSCALL 228

src/glibc/sysdeps/unix/sysv/linux/i386/i686/listxattr.c

@@ -0,0 +1,21 @@
+#include <sys/xattr.h>
+#include <errno.h>
+#include <syscall-template.h>
+#include <lind_syscall_num.h>
+#include <addr_translation.h>
+
+/* List extended attributes associated with the file specified by path.
+   If list is NULL and size is zero, returns the buffer size needed.
+   Returns the size of the attribute list, or -1 and sets errno on error. */
+ssize_t
+__listxattr (const char *path, char *list, size_t size)
+{
+  return MAKE_LEGACY_SYSCALL (LISTXATTR_SYSCALL, "syscall|listxattr",
+		       (uint64_t) TRANSLATE_GUEST_POINTER_TO_HOST (path),
+		       (uint64_t) TRANSLATE_GUEST_POINTER_TO_HOST (list),
+		       (uint64_t) size,
+		       NOTUSED,
+		       NOTUSED,
+		       NOTUSED, TRANSLATE_ERRNO_ON);
+}
+weak_alias(__listxattr, listxattr)

src/glibc/sysdeps/unix/sysv/linux/i386/i686/setxattr.c

@@ -0,0 +1,21 @@
+#include <sys/xattr.h>
+#include <errno.h>
+#include <syscall-template.h>
+#include <lind_syscall_num.h>
+#include <addr_translation.h>
+
+/* Set extended attributes on a file specified by path.
+   Returns 0 on success, or -1 and sets errno on error. */
+int
+__setxattr (const char *path, const char *name, const void *value,
+            size_t size, int flags)
+{
+  return MAKE_LEGACY_SYSCALL (SETXATTR_SYSCALL, "syscall|setxattr",
+		       (uint64_t) TRANSLATE_GUEST_POINTER_TO_HOST (path),
+		       (uint64_t) TRANSLATE_GUEST_POINTER_TO_HOST (name),
+		       (uint64_t) TRANSLATE_GUEST_POINTER_TO_HOST (value),
+		       (uint64_t) size,
+		       (uint64_t) flags,
+		       NOTUSED, TRANSLATE_ERRNO_ON);
+}
+weak_alias(__setxattr, setxattr)

src/rawposix/src/fs_calls.rs

@@ -4803,20 +4803,6 @@ pub extern "C" fn symlinkat_syscall(
 
     ret
 }
-            "getrandom_syscall"
-        );
-    }
-
-    let ret = unsafe { getrandom(buf as *mut c_void, buflen.try_into().unwrap(), flags) };
-    if ret < 0 {
-        let errno = get_errno();
-        return handle_errno(errno, "getrandom");
-    }
-
-    // convert isize to i32 safely, as ret shouldn't be larger than 32-bit
-    // due to buflen being u32
-    ret.try_into().unwrap()
-}
 
 /// Linux reference: https://man7.org/linux/man-pages/man2/setxattr.2.html
 ///
@@ -4853,18 +4839,24 @@ pub extern "C" fn setxattr_syscall(
     arg6: u64,
     arg6_cageid: u64,
 ) -> i32 {
-    // Type conversion
+    // Type conversion for path
     let path = match sc_convert_path_to_host(path_arg, path_cageid, cageid) {
         Ok(path) => path,
         Err(e) => return syscall_error(e, "setxattr", "path conversion failed"),
     };
 
-    let name = match sc_convert_path_to_host(name_arg, name_cageid, cageid) {
-        Ok(name) => name,
-        Err(e) => return syscall_error(e, "setxattr", "name conversion failed"),
+    // Type conversion for name (attribute name, not a path - no path normalization needed)
+    let name_str = match get_cstr(name_arg) {
+        Ok(s) => s,
+        Err(_) => return syscall_error(Errno::EFAULT, "setxattr", "name conversion failed"),
+    };
+    let name = match std::ffi::CString::new(name_str) {
+        Ok(s) => s,
+        Err(_) => return syscall_error(Errno::EINVAL, "setxattr", "name contains null byte"),
     };
 
-    let value = value_arg as *const libc::c_void;
+    // Type conversion for value buffer
+    let value = sc_convert_buf(value_arg, value_cageid, cageid) as *const libc::c_void;
     let size = sc_convert_sysarg_to_usize(size_arg, size_cageid, cageid);
     let flags = sc_convert_sysarg_to_i32(flags_arg, flags_cageid, cageid);
 
@@ -4919,16 +4911,17 @@ pub extern "C" fn listxattr_syscall(
     arg6: u64,
     arg6_cageid: u64,
 ) -> i32 {
-    // Type conversion
+    // Type conversion for path
     let path = match sc_convert_path_to_host(path_arg, path_cageid, cageid) {
         Ok(path) => path,
         Err(e) => return syscall_error(e, "listxattr", "path conversion failed"),
     };
 
+    // Type conversion for list buffer (may be NULL)
     let list = if list_arg == 0 {
         std::ptr::null_mut()
     } else {
-        list_arg as *mut libc::c_char
+        sc_convert_to_u8_mut(list_arg, list_cageid, cageid) as *mut libc::c_char
     };
     let size = sc_convert_sysarg_to_usize(size_arg, size_cageid, cageid);
 

src/rawposix/src/syscall_table.rs

@@ -12,10 +12,10 @@ use super::fs_calls::{
     mknod_syscall, mmap_syscall, mprotect_syscall, munmap_syscall, nanosleep_time64_syscall,
     open_syscall, openat_syscall, pipe2_syscall, pipe_syscall, pread_syscall, preadv_syscall,
     pwrite_syscall, pwritev_syscall, read_syscall, readlink_syscall, readlinkat_syscall,
-    readv_syscall, rename_syscall, rmdir_syscall, setxattr_syscall, shmat_syscall,
-    shmctl_syscall, shmdt_syscall, shmget_syscall, stat_syscall, statfs_syscall,
-    symlink_syscall, symlinkat_syscall, sync_file_range_syscall, truncate_syscall,
-    unlink_syscall, unlinkat_syscall, write_syscall, writev_syscall,
+    readv_syscall, rename_syscall, rmdir_syscall, setxattr_syscall, shmat_syscall, shmctl_syscall,
+    shmdt_syscall, shmget_syscall, stat_syscall, statfs_syscall, symlink_syscall,
+    symlinkat_syscall, sync_file_range_syscall, truncate_syscall, unlink_syscall, unlinkat_syscall,
+    write_syscall, writev_syscall,
 };
 use super::init::RawCallFunc;
 use super::net_calls::{