mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-09-21 10:19:03 +03:00
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.
This commit is contained in:
parent
c7858622ec
commit
e7183cc762
Notes:
sideshowbarker
2024-07-18 22:50:41 +09:00
Author: https://github.com/linusg Commit: https://github.com/SerenityOS/serenity/commit/e7183cc762f Pull-request: https://github.com/SerenityOS/serenity/pull/5127
@ -67,29 +67,26 @@ int Process::sys$pledge(Userspace<const Syscall::SC_pledge_params*> 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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user