Moves sys_is_in_sandbox to ProcManager (#842)

src/kernel/src/main.rs

@@ -373,7 +373,7 @@ fn run() -> Result<(), KernelError> {
     NamedObjManager::new(&mut syscalls);
     OsemManager::new(&mut syscalls);
     UmtxManager::new(&mut syscalls);
-    let pmgr = ProcManager::new(&mut syscalls);
+    let pmgr = ProcManager::new(&fs, &mut syscalls);
 
     // Initialize runtime linker.
     let ee = NativeEngine::new();

src/kernel/src/process/mod.rs

@@ -1,7 +1,7 @@
 use crate::budget::ProcType;
 use crate::dev::DmemContainer;
 use crate::errno::{EINVAL, ENAMETOOLONG, EPERM, ESRCH};
-use crate::fs::Vnode;
+use crate::fs::{Fs, Vnode};
 use crate::info;
 use crate::signal::{
     strsignal, SigChldFlags, Signal, SignalAct, SignalFlags, SIGCHLD, SIGKILL, SIGSTOP, SIG_DFL,
@@ -39,12 +39,14 @@ mod signal;
 mod thread;
 
 /// Manage all PS4 processes.
-pub struct ProcManager {}
+pub struct ProcManager {
+    fs: Arc<Fs>,
+}
 
 impl ProcManager {
-    pub fn new(sys: &mut Syscalls) -> Arc<Self> {
+    pub fn new(fs: &Arc<Fs>, sys: &mut Syscalls) -> Arc<Self> {
         // Register syscalls.
-        let pmgr = Arc::new(Self {});
+        let pmgr = Arc::new(Self { fs: fs.clone() });
 
         sys.register(20, &pmgr, Self::sys_getpid);
         sys.register(50, &pmgr, Self::sys_setlogin);
@@ -52,6 +54,7 @@ impl ProcManager {
         sys.register(416, &pmgr, Self::sys_sigaction);
         sys.register(432, &pmgr, Self::sys_thr_self);
         sys.register(464, &pmgr, Self::sys_thr_set_name);
+        sys.register(585, &pmgr, Self::sys_is_in_sandbox);
         sys.register(602, &pmgr, Self::sys_randomized_path);
 
         pmgr
@@ -296,6 +299,12 @@ impl ProcManager {
         Ok(SysOut::ZERO)
     }
 
+    fn sys_is_in_sandbox(self: &Arc<Self>, td: &VThread, _: &SysIn) -> Result<SysOut, SysErr> {
+        let v = !Arc::ptr_eq(&td.proc().files().root(), &self.fs.root());
+
+        Ok(v.into())
+    }
+
     fn sys_randomized_path(self: &Arc<Self>, td: &VThread, i: &SysIn) -> Result<SysOut, SysErr> {
         let set = i.args[0];
         let get: *mut c_char = i.args[1].into();

src/kernel/src/process/proc.rs

@@ -4,8 +4,7 @@ use super::{
 };
 use crate::budget::ProcType;
 use crate::dev::DmemContainer;
-use crate::errno::Errno;
-use crate::errno::{EINVAL, ERANGE, ESRCH};
+use crate::errno::{Errno, EINVAL, ERANGE, ESRCH};
 use crate::fs::Vnode;
 use crate::idt::Idt;
 use crate::info;
@@ -101,7 +100,6 @@ impl VProc {
         sys.register(466, &vp, Self::sys_rtprio_thread);
         sys.register(487, &vp, Self::sys_cpuset_getaffinity);
         sys.register(488, &vp, Self::sys_cpuset_setaffinity);
-        sys.register(585, &vp, Self::sys_is_in_sandbox);
         sys.register(587, &vp, Self::sys_get_authinfo);
         sys.register(612, &vp, Self::sys_get_proc_type_info);
 
@@ -374,11 +372,6 @@ impl VProc {
         }
     }
 
-    fn sys_is_in_sandbox(self: &Arc<Self>, _: &VThread, _: &SysIn) -> Result<SysOut, SysErr> {
-        // TODO: Implement this once FS rework has been usable.
-        Ok(1.into())
-    }
-
     fn sys_get_authinfo(self: &Arc<Self>, td: &VThread, i: &SysIn) -> Result<SysOut, SysErr> {
         // Get arguments.
         let pid: i32 = i.args[0].try_into().unwrap();

src/kernel/src/syscalls/output.rs

@@ -21,6 +21,15 @@ impl<T> From<*mut T> for SysOut {
     }
 }
 
+impl From<bool> for SysOut {
+    fn from(value: bool) -> Self {
+        Self {
+            rax: value.into(),
+            rdx: 0,
+        }
+    }
+}
+
 impl From<i32> for SysOut {
     fn from(value: i32) -> Self {
         Self {