[NTOS:EX] Worker threads must not exit with a critical region held. CORE-13734

diff --git a/ntoskrnl/ex/work.c b/ntoskrnl/ex/work.c
index 731f442..24d328a 100644 (file)
--- a/ntoskrnl/ex/work.c
+++ b/ntoskrnl/ex/work.c
@@ -162,7 +162,7 @@ ProcessLoop:
         WorkItem->WorkerRoutine(WorkItem->Parameter);
 
         /* Make sure APCs are not disabled */
         WorkItem->WorkerRoutine(WorkItem->Parameter);
 
         /* Make sure APCs are not disabled */

-        if (Thread->Tcb.SpecialApcDisable)
+        if (Thread->Tcb.CombinedApcDisable != 0)

         {
             /* We're nice and do it behind your back */
             DPRINT1("Warning: Broken Worker Thread: %p %p %p came back "
         {
             /* We're nice and do it behind your back */
             DPRINT1("Warning: Broken Worker Thread: %p %p %p came back "


@@ -170,7 +170,8 @@ ProcessLoop:
                     WorkItem->WorkerRoutine,
                     WorkItem->Parameter,
                     WorkItem);
                     WorkItem->WorkerRoutine,
                     WorkItem->Parameter,
                     WorkItem);

-            Thread->Tcb.SpecialApcDisable = 0;
+            ASSERT(Thread->Tcb.CombinedApcDisable == 0);
+            Thread->Tcb.CombinedApcDisable = 0;

         }
 
         /* Make sure it returned at right IRQL */
         }
 
         /* Make sure it returned at right IRQL */