Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-28 01:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS:KE] Unconditionally check IRQL when acquiring & releasing spinlock at DISPATCH_LEVEL

Browse source
This commit is contained in:
Jérôme Gardou 2021-05-21 09:44:32 +02:00 • committed by Jérôme Gardou
parent f30136bc79
commit 37d0a9c3f4
2 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ntoskrnl/include/internal/ke.h
View file

@ -986,16 +986,22 @@ VOID
NTAPI NTAPI
KeThawExecution(IN BOOLEAN Enable); KeThawExecution(IN BOOLEAN Enable);
_IRQL_requires_min_(DISPATCH_LEVEL)
_Acquires_nonreentrant_lock_(*LockHandle->Lock)
_Acquires_exclusive_lock_(*LockHandle->Lock)
VOID VOID
FASTCALL FASTCALL
KeAcquireQueuedSpinLockAtDpcLevel( KeAcquireQueuedSpinLockAtDpcLevel(
IN OUT PKSPIN_LOCK_QUEUE LockQueue _Inout_ PKSPIN_LOCK_QUEUE LockQueue
); );
_IRQL_requires_min_(DISPATCH_LEVEL)
_Releases_nonreentrant_lock_(*LockHandle->Lock)
_Releases_exclusive_lock_(*LockHandle->Lock)
VOID VOID
FASTCALL FASTCALL
KeReleaseQueuedSpinLockFromDpcLevel( KeReleaseQueuedSpinLockFromDpcLevel(
IN OUT PKSPIN_LOCK_QUEUE LockQueue _Inout_ PKSPIN_LOCK_QUEUE LockQueue
); );
VOID VOID

25
ntoskrnl/ke/spinlock.c
View file

@ -94,11 +94,14 @@ KeReleaseQueuedSpinLockFromDpcLevel(IN PKSPIN_LOCK_QUEUE LockHandle)
// HACK: Hacked to work like normal spinlocks // HACK: Hacked to work like normal spinlocks
// //
_IRQL_requires_min_(DISPATCH_LEVEL)
_Acquires_nonreentrant_lock_(*LockHandle->Lock)
_Acquires_exclusive_lock_(*LockHandle->Lock)
VOID VOID
FASTCALL FASTCALL
KeAcquireQueuedSpinLockAtDpcLevel(IN PKSPIN_LOCK_QUEUE LockHandle) KeAcquireQueuedSpinLockAtDpcLevel(_Inout_ PKSPIN_LOCK_QUEUE LockHandle)
{ {
#ifdef CONFIG_SMP #if defined(CONFIG_SMP) || DBG
/* Make sure we are at DPC or above! */ /* Make sure we are at DPC or above! */
if (KeGetCurrentIrql() < DISPATCH_LEVEL) if (KeGetCurrentIrql() < DISPATCH_LEVEL)
{ {
@ -115,11 +118,14 @@ KeAcquireQueuedSpinLockAtDpcLevel(IN PKSPIN_LOCK_QUEUE LockHandle)
KxAcquireSpinLock(LockHandle->Lock); KxAcquireSpinLock(LockHandle->Lock);
} }
_IRQL_requires_min_(DISPATCH_LEVEL)
_Releases_nonreentrant_lock_(*LockHandle->Lock)
_Releases_exclusive_lock_(*LockHandle->Lock)
VOID VOID
FASTCALL FASTCALL
KeReleaseQueuedSpinLockFromDpcLevel(IN PKSPIN_LOCK_QUEUE LockHandle) KeReleaseQueuedSpinLockFromDpcLevel(_Inout_ PKSPIN_LOCK_QUEUE LockHandle)
{ {
#ifdef CONFIG_SMP #if defined(CONFIG_SMP) || DBG
/* Make sure we are at DPC or above! */ /* Make sure we are at DPC or above! */
if (KeGetCurrentIrql() < DISPATCH_LEVEL) if (KeGetCurrentIrql() < DISPATCH_LEVEL)
{ {
@ -303,6 +309,17 @@ FASTCALL
KeTryToAcquireSpinLockAtDpcLevel(IN OUT PKSPIN_LOCK SpinLock) KeTryToAcquireSpinLockAtDpcLevel(IN OUT PKSPIN_LOCK SpinLock)
{ {
#if DBG #if DBG
/* Make sure we are at DPC or above! */
if (KeGetCurrentIrql() < DISPATCH_LEVEL)
{
/* We aren't -- bugcheck */
KeBugCheckEx(IRQL_NOT_GREATER_OR_EQUAL,
(ULONG_PTR)SpinLock,
KeGetCurrentIrql(),
0,
0);
}
/* Make sure that we don't own the lock already */ /* Make sure that we don't own the lock already */
if (((KSPIN_LOCK)KeGetCurrentThread() | 1) == *SpinLock) if (((KSPIN_LOCK)KeGetCurrentThread() | 1) == *SpinLock)
{ {