RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 16:37:35 +00:00
Code Issues Activity Actions

Kernel: Fix bad assertion in Lock::unlock_if_locked()

Browse source 
We shouldn't assert if you call this on a Lock held by another Thread
in the same Process. Instead, we should just not unlock.
This commit is contained in:
Andreas Kling 2019-09-14 19:35:07 +02:00
parent 58ceaebd5a
commit b35ad5b523
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Kernel/Lock.cpp
View file

@ -49,11 +49,13 @@ bool Lock::unlock_if_locked()
for (;;) { for (;;) {
if (CAS(&m_lock, 1, 0) == 0) { if (CAS(&m_lock, 1, 0) == 0) {
if (m_level == 0) { if (m_level == 0) {
memory_barrier();
m_lock = 0; m_lock = 0;
return false; return false;
} }
ASSERT(m_holder == current); if (m_holder != current) {
m_lock = 0;
return false;
}
ASSERT(m_level); ASSERT(m_level);
--m_level; --m_level;
if (m_level) { if (m_level) {