1.6.5

CHANGELOG.md

@@ -9,7 +9,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - fixed issue with msedge in a security enchanced box [#2571](https://github.com/sandboxie-plus/Sandboxie/issues/2571)
 - opened OpenIpcPath=\{BEC19D6F-D7B2-41A8-860C-8787BB964F2D} on ARM64 systems 
-
+- fixed incompatybility with windows 11 21h2 ARM64 [#2431](https://github.com/sandboxie-plus/Sandboxie/issues/2431)
 
 
 

Sandboxie/common/my_version.h

@@ -21,8 +21,8 @@
 #ifndef _MY_VERSION_H
 #define _MY_VERSION_H
 
-#define MY_VERSION_BINARY       5,61,4
-#define MY_VERSION_STRING       "5.61.4"
+#define MY_VERSION_BINARY       5,61,5
+#define MY_VERSION_STRING       "5.61.5"
 #define MY_ABI_VERSION          0x56000
 
 // These #defines are used by either Resource Compiler or NSIS installer

Sandboxie/core/drv/syscall.c

@@ -821,14 +821,18 @@ _FX NTSTATUS Syscall_Api_Invoke(PROCESS *proc, ULONG64 *parms)
 
         if (!traced && ((proc->call_trace & TRACE_ALLOW) || ((status != STATUS_SUCCESS) && (proc->call_trace & TRACE_DENY))))
         {
-            WCHAR trace_str[128];
-            RtlStringCbPrintfW(trace_str, sizeof(trace_str), L"%.*S, status = 0x%X", //59 chars + entry->name
-                max(strlen(entry->name), 64), entry->name,
-                status);
-            const WCHAR* strings[3] = { trace_str, trace_str + (entry->name_len + 2), NULL };
-            ULONG lengths[3] = {entry->name_len, wcslen(trace_str) - (entry->name_len + 2), 0 };
-            Session_MonitorPutEx(MONITOR_SYSCALL | (entry->approved ? MONITOR_OPEN : MONITOR_TRACE), 
-                strings, lengths, PsGetCurrentProcessId(), PsGetCurrentThreadId());
+            // Supress Sbie's own calls to DeviceIoControlFile
+            if ((strcmp(entry->name, "DeviceIoControlFile") != 0) || user_args[5] != API_SBIEDRV_CTLCODE)
+            {
+                WCHAR trace_str[128];
+                RtlStringCbPrintfW(trace_str, sizeof(trace_str), L"%.*S, status = 0x%X", //59 chars + entry->name
+                    max(strlen(entry->name), 64), entry->name,
+                    status);
+                const WCHAR* strings[3] = { trace_str, trace_str + (entry->name_len + 2), NULL };
+                ULONG lengths[3] = { entry->name_len, wcslen(trace_str) - (entry->name_len + 2), 0 };
+                Session_MonitorPutEx(MONITOR_SYSCALL | (entry->approved ? MONITOR_OPEN : MONITOR_TRACE),
+                    strings, lengths, PsGetCurrentProcessId(), PsGetCurrentThreadId());
+            }
         }
 
 #ifdef _WIN64

Sandboxie/core/drv/syscall_64.c

@@ -140,7 +140,9 @@ _FX void *Syscall_GetMasterServiceTable(void)
             ADD add;
             add.OP = *(ULONG*)(ptr + 4);
 
-            if (IS_ADD(add) && add.Rn == 8 && add.Rd == 12) { // add  x12, x8, #0xf80
+            // Win 10 22h2: add x12, x8, #0xf80 
+            // Win 11 21h2: add  x9, x8, #0xf80
+            if (IS_ADD(add) && add.Rn == 8 && (add.Rd == 12 || add.Rd == 9)) {
             
                 LONG delta = (adrp.immHi << 2 | adrp.immLo) << 12;
                 delta += add.imm12;

SandboxiePlus/version.h

@@ -2,7 +2,7 @@
 
 #define VERSION_MJR		1
 #define VERSION_MIN 	6
-#define VERSION_REV 	4
+#define VERSION_REV 	5
 #define VERSION_UPD 	0
 
 #ifndef STR