RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 14:48:14 +00:00
Code Issues Activity Actions

Kernel: Don't drop pledge()'d promises/execpromises when passing nullptr

Browse source 
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:
Linus Groh 2021-01-26 17:47:20 +01:00 • committed by Andreas Kling
parent c7858622ec
commit e7183cc762
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Kernel/Syscalls/pledge.cpp
View file

@ -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;
}