3 files changed, 16 insertions, 0 deletions
diff --git a/sys/objdir.c b/sys/objdir.c
index eab935f..f956309 100644
--- a/sys/objdir.c
+++ b/sys/objdir.c
@@ -112,6 +112,13 @@ objdir_trygetobj(
     }
 }
 
+bool
+objdir_compare(jove_owned_obj_t *objdir_obj, objpath_part_t entry, jove_obj_t *obj)
+{
+    jove_obj_t peekobj = objdir_peeklocal(objdir_obj, entry);
+    return obj_compare(&peekobj, obj);
+}
+
 void
 objdir_swapobj(jove_owned_obj_t *a, jove_owned_obj_t *b)
 {
diff --git a/sys/objdir.h b/sys/objdir.h
index e2ae7ef..e86e582 100644
--- a/sys/objdir.h
+++ b/sys/objdir.h
@@ -1,6 +1,7 @@
 #ifndef _JOVE_SYS_OBJDIR_H
 #define _JOVE_SYS_OBJDIR_H 1
 
+#include "api/obj.h"
 #include "hal/obj.h"
 
 int objdir_new(jove_owned_obj_t *untyped_obj);
@@ -23,6 +24,7 @@ jove_owned_obj_t *objdir_getobj(jove_owned_obj_t *objdir_obj, const uint16_t *pa
 /*Same as objdir_getobj but does not block if child objects are locked.*/
 jove_owned_obj_t *objdir_trygetobj(jove_owned_obj_t *objdir_obj, const uint16_t *path, size_t path_len);
 
+bool objdir_compare(jove_owned_obj_t *objdir_obj, objpath_part_t entry, jove_obj_t *obj);
 void objdir_swapobj(jove_owned_obj_t *a, jove_owned_obj_t *b);
 
 #endif
diff --git a/sys/syscall_untyped.c b/sys/syscall_untyped.c
index 1ec21c7..c4378ea 100644
--- a/sys/syscall_untyped.c
+++ b/sys/syscall_untyped.c
@@ -1,8 +1,11 @@
+#include "api/process.h"
 #include "arch/x86_64/hal/obj.h"
 #include "hal/memory.h"
+#include "hal/obj.h"
 #include "jove.h"
 #include "lib/printf.h"
 #include "proc/process.h"
+#include "sys/objdir.h"
 #include "syscall.h"
 
 static int
@@ -91,6 +94,10 @@ s_syscall_untyped_retype_pcb(jove_owned_obj_t *untyped_obj,
         return -errno;
     }
     CHECK_OBJPERM(objdir_obj, JOVE_PERM_ALL, "New PCB needs full access to it's root objdir!");
+    if(!objdir_compare(objdir_obj.obj, PCB_ROOTDIR_SELF_I, obj_asunowned(untyped_obj))) {
+        klogf("Untyped is not in objdir entry %i\n", PCB_ROOTDIR_SELF_I);
+        return -EBADPATH;
+    }
 
     obj_settype(untyped_obj, JOVE_OBJ_PCB);
     return pcb_new(untyped_obj, untyped->limit, objdir_obj.obj);