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

[Zion] Make sure result of ValidateCapability is used.

This commit is contained in:
Drew Galbraith 2024-08-17 17:14:30 -07:00
parent c6dbc395aa
commit 19a8ab41d4
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rust/lib/mammoth/src/elf.rs
View File

@ -331,7 +331,7 @@ pub fn spawn_process_from_elf(elf_file: &[u8]) -> Result<z_cap_t, ZError> {
port.write_u64_and_cap(crate::init::Z_INIT_SELF_VMAS, new_as_cap)?; port.write_u64_and_cap(crate::init::Z_INIT_SELF_VMAS, new_as_cap)?;
port.write_u64_and_cap( port.write_u64_and_cap(
crate::init::Z_INIT_ENDPOINT, crate::init::Z_INIT_ENDPOINT,
syscall::cap_duplicate(unsafe { crate::init::INIT_ENDPOINT }, u64::MAX)?, self_cap.duplicate(Capability::PERMS_ALL)?,
)?; )?;
let thread_cap = syscall::thread_create(new_proc_cap)?; let thread_cap = syscall::thread_create(new_proc_cap)?;

6
zion/capability/capability.h
View File

@ -5,6 +5,7 @@
#include <glacier/status/error.h> #include <glacier/status/error.h>
#include <stdint.h> #include <stdint.h>
#include "debug/debug.h"
#include "include/ztypes.h" #include "include/ztypes.h"
#include "object/kernel_object.h" #include "object/kernel_object.h"
@ -42,7 +43,10 @@ class Capability : public glcr::RefCounted<Capability> {
template <typename T> template <typename T>
glcr::RefPtr<T> Capability::obj() { glcr::RefPtr<T> Capability::obj() {
if (obj_->TypeTag() != KernelObjectTag<T>::type) { if (obj_->TypeTag() != KernelObjectTag<T>::type) {
return nullptr; uint64_t type = KernelObjectTag<T>::type;
dbgln("Mismatched type tag returning nullptr.");
dbgln("Expected {x} got {x}", type, obj_->TypeTag());
panic("Unhandled obj type mismatch");
} }
return StaticCastRefPtr<T>(obj_); return StaticCastRefPtr<T>(obj_);
} }

8
zion/syscall/ipc.cpp
View File

@ -175,7 +175,7 @@ glcr::ErrorCode EndpointSend(ZEndpointSendReq* req) {
auto& proc = gScheduler->CurrentProcess(); auto& proc = gScheduler->CurrentProcess();
auto endpoint_cap = proc.GetCapability(req->endpoint_cap); auto endpoint_cap = proc.GetCapability(req->endpoint_cap);
ValidateCapability<Endpoint>(endpoint_cap, kZionPerm_Write); RET_ERR(ValidateCapability<Endpoint>(endpoint_cap, kZionPerm_Write));
auto endpoint = endpoint_cap->obj<Endpoint>(); auto endpoint = endpoint_cap->obj<Endpoint>();
auto reply_port = ReplyPort::Create(); auto reply_port = ReplyPort::Create();
@ -191,7 +191,7 @@ glcr::ErrorCode EndpointRecv(ZEndpointRecvReq* req) {
auto& proc = gScheduler->CurrentProcess(); auto& proc = gScheduler->CurrentProcess();
auto endpoint_cap = proc.GetCapability(req->endpoint_cap); auto endpoint_cap = proc.GetCapability(req->endpoint_cap);
ValidateCapability<Endpoint>(endpoint_cap, kZionPerm_Read); RET_ERR(ValidateCapability<Endpoint>(endpoint_cap, kZionPerm_Read));
auto endpoint = endpoint_cap->obj<Endpoint>(); auto endpoint = endpoint_cap->obj<Endpoint>();
ASSIGN_OR_RETURN(IpcMessage msg, ASSIGN_OR_RETURN(IpcMessage msg,
@ -202,7 +202,7 @@ glcr::ErrorCode EndpointRecv(ZEndpointRecvReq* req) {
glcr::ErrorCode ReplyPortSend(ZReplyPortSendReq* req) { glcr::ErrorCode ReplyPortSend(ZReplyPortSendReq* req) {
auto& proc = gScheduler->CurrentProcess(); auto& proc = gScheduler->CurrentProcess();
auto reply_port_cap = proc.GetCapability(req->reply_port_cap); auto reply_port_cap = proc.GetCapability(req->reply_port_cap);
ValidateCapability<ReplyPort>(reply_port_cap, kZionPerm_Read); RET_ERR(ValidateCapability<ReplyPort>(reply_port_cap, kZionPerm_Read));
auto reply_port = reply_port_cap->obj<ReplyPort>(); auto reply_port = reply_port_cap->obj<ReplyPort>();
ASSIGN_OR_RETURN(IpcMessage message, TranslateRequestToIpcMessage(*req)); ASSIGN_OR_RETURN(IpcMessage message, TranslateRequestToIpcMessage(*req));
@ -212,7 +212,7 @@ glcr::ErrorCode ReplyPortRecv(ZReplyPortRecvReq* req) {
auto& proc = gScheduler->CurrentProcess(); auto& proc = gScheduler->CurrentProcess();
auto reply_port_cap = proc.GetCapability(req->reply_port_cap); auto reply_port_cap = proc.GetCapability(req->reply_port_cap);
ValidateCapability<ReplyPort>(reply_port_cap, kZionPerm_Read); RET_ERR(ValidateCapability<ReplyPort>(reply_port_cap, kZionPerm_Read));
auto reply_port = reply_port_cap->obj<ReplyPort>(); auto reply_port = reply_port_cap->obj<ReplyPort>();
ASSIGN_OR_RETURN(IpcMessage msg, ASSIGN_OR_RETURN(IpcMessage msg,