PR feedback

Signed-off-by: Alan Jowett <[email protected]>
microsoft · Apr 20, 2024 · d4c89ff · d4c89ff
1 parent 335852d
commit d4c89ff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/external/Catch2 b/external/Catch2
diff --git a/src/ke.cpp b/src/ke.cpp
@@ -224,6 +224,12 @@ KeSetSystemAffinityThreadEx(KAFFINITY affinity)
 {
     GROUP_AFFINITY old_affinity;
     usersim_get_current_thread_group_affinity(&old_affinity);
+    // Reject affinities that are not valid for the current group.
+    // Assume that the affinity mask is contiguous.
+    KAFFINITY valid_affinity_mask = (1 << KeQueryMaximumProcessorCountEx(old_affinity.Group)) - 1;
+    if ((affinity & valid_affinity_mask) == 0) {
+        return 0;
+    }
     _usersim_thread_affinity.Group = old_affinity.Group;
     _usersim_thread_affinity.Mask = affinity;
     if (KeGetCurrentIrql() < DISPATCH_LEVEL && SetThreadAffinityMask(GetCurrentThread(), affinity) == 0) {
+0 −2		conanfile.py
+2 −1		src/catch2/internal/catch_random_integer_helpers.hpp
+1 −1		src/catch2/matchers/catch_matchers_floating_point.cpp
+10 −10		tests/SelfTest/Baselines/compact.sw.approved.txt
+10 −10		tests/SelfTest/Baselines/compact.sw.multi.approved.txt
+10 −10		tests/SelfTest/Baselines/console.sw.approved.txt
+10 −10		tests/SelfTest/Baselines/console.sw.multi.approved.txt
+10 −10		tests/SelfTest/Baselines/tap.sw.approved.txt
+10 −10		tests/SelfTest/Baselines/tap.sw.multi.approved.txt
+10 −10		tests/SelfTest/Baselines/xml.sw.approved.txt
+10 −10		tests/SelfTest/Baselines/xml.sw.multi.approved.txt