drew
/
acadia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

[zion] Fix capability permission issues

This commit is contained in:
Drew Galbraith 2023-06-17 01:24:07 -07:00
parent 424b032146
commit 6e86ce67f0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zion/include/zcall.h
View File

@ -15,7 +15,7 @@
#define Z_PROCESS_START 0x03 #define Z_PROCESS_START 0x03
#define ZC_PROC_SPAWN_PROC 0x100 #define ZC_PROC_SPAWN_PROC 0x100
#define ZC_PROC_SPAWN_THREAD 0x101 #define ZC_PROC_SPAWN_THREAD 0x200
// Thread Calls. // Thread Calls.
#define Z_THREAD_CREATE 0x10 #define Z_THREAD_CREATE 0x10

5
zion/syscall/syscall.cpp
View File

@ -57,7 +57,10 @@ z_err_t ValidateCap(const RefPtr<Capability>& cap, uint64_t permissions) {
if (!cap) { if (!cap) {
return Z_ERR_CAP_NOT_FOUND; return Z_ERR_CAP_NOT_FOUND;
} }
// FIXME: Check capability type before permissions, otherwise you can
// get a confusing error.
if (!cap->HasPermissions(permissions)) { if (!cap->HasPermissions(permissions)) {
dbgln("PERM, has %x needs %x", cap->permissions(), permissions);
return Z_ERR_CAP_DENIED; return Z_ERR_CAP_DENIED;
} }
return Z_OK; return Z_OK;
@ -72,7 +75,7 @@ z_err_t ProcessSpawn(ZProcessSpawnReq* req, ZProcessSpawnResp* resp) {
gProcMan->InsertProcess(proc); gProcMan->InsertProcess(proc);
resp->proc_cap = curr_proc.AddNewCapability( resp->proc_cap = curr_proc.AddNewCapability(
proc, ZC_PROC_SPAWN_PROC | ZC_PROC_SPAWN_PROC | ZC_WRITE); proc, ZC_PROC_SPAWN_PROC | ZC_PROC_SPAWN_THREAD | ZC_WRITE);
resp->vmas_cap = curr_proc.AddNewCapability(proc->vmas(), ZC_WRITE); resp->vmas_cap = curr_proc.AddNewCapability(proc->vmas(), ZC_WRITE);
if (req->bootstrap_cap != 0) { if (req->bootstrap_cap != 0) {