From e7183cc762f634c73be4b4b018b96de8dc5b3031 Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Tue, 26 Jan 2021 17:47:20 +0100 Subject: [PATCH] Kernel: Don't drop pledge()'d promises/execpromises when passing nullptr When passing nullptr for either promises or execpromises to pledge(), the expected behaviour is to not change their current value at all - we were accidentally resetting them to 0, effectively dropping previously pledge()'d promises. --- Kernel/Syscalls/pledge.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Kernel/Syscalls/pledge.cpp b/Kernel/Syscalls/pledge.cpp index 0613ab575ea..448fad8ef81 100644 --- a/Kernel/Syscalls/pledge.cpp +++ b/Kernel/Syscalls/pledge.cpp @@ -67,29 +67,26 @@ int Process::sys$pledge(Userspace user_params) return true; }; - u32 new_promises = 0; - u32 new_execpromises = 0; - if (!promises.is_null()) { + u32 new_promises = 0; if (!parse_pledge(promises, new_promises)) return -EINVAL; if (m_promises && (!new_promises || new_promises & ~m_promises)) return -EPERM; + m_has_promises = true; + m_promises = new_promises; } if (!execpromises.is_null()) { + u32 new_execpromises = 0; if (!parse_pledge(execpromises, new_execpromises)) return -EINVAL; if (m_execpromises && (!new_execpromises || new_execpromises & ~m_execpromises)) return -EPERM; + m_has_execpromises = true; + m_execpromises = new_execpromises; } - m_has_promises = m_has_promises || !promises.is_null(); - m_has_execpromises = m_has_execpromises || !execpromises.is_null(); - - m_promises = new_promises; - m_execpromises = new_execpromises; - return 0; }