From 317f1e8391f4f8b8cf03d9d4d12e7eaf55afc3fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 12 Mar 2023 22:11:36 +0100 Subject: [PATCH] [NDK][NTOS:EX:KD64] Add SAL annotations to Kd/Nt/ZwSystemDebugControl. --- ntoskrnl/ex/dbgctrl.c | 13 +++++++------ ntoskrnl/kd64/kdapi.c | 6 +++--- sdk/include/ndk/kdfuncs.h | 30 +++++++++++++++--------------- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/ntoskrnl/ex/dbgctrl.c b/ntoskrnl/ex/dbgctrl.c index f3fc6c0b43b..17dc980f999 100644 --- a/ntoskrnl/ex/dbgctrl.c +++ b/ntoskrnl/ex/dbgctrl.c @@ -185,12 +185,13 @@ ExpDebuggerWorker( *--*/ NTSTATUS NTAPI -NtSystemDebugControl(SYSDBG_COMMAND ControlCode, - PVOID InputBuffer, - ULONG InputBufferLength, - PVOID OutputBuffer, - ULONG OutputBufferLength, - PULONG ReturnLength) +NtSystemDebugControl( + _In_ SYSDBG_COMMAND ControlCode, + _In_reads_bytes_(InputBufferLength) PVOID InputBuffer, + _In_ ULONG InputBufferLength, + _Out_writes_bytes_(OutputBufferLength) PVOID OutputBuffer, + _In_ ULONG OutputBufferLength, + _Out_opt_ PULONG ReturnLength) { switch (ControlCode) { diff --git a/ntoskrnl/kd64/kdapi.c b/ntoskrnl/kd64/kdapi.c index ba226ce6e17..cb0c65bd341 100644 --- a/ntoskrnl/kd64/kdapi.c +++ b/ntoskrnl/kd64/kdapi.c @@ -2178,11 +2178,11 @@ NTSTATUS NTAPI KdSystemDebugControl( _In_ SYSDBG_COMMAND Command, - _In_ PVOID InputBuffer, + _In_reads_bytes_(InputBufferLength) PVOID InputBuffer, _In_ ULONG InputBufferLength, - _Out_ PVOID OutputBuffer, + _Out_writes_bytes_(OutputBufferLength) PVOID OutputBuffer, _In_ ULONG OutputBufferLength, - _Inout_ PULONG ReturnLength, + _Out_opt_ PULONG ReturnLength, _In_ KPROCESSOR_MODE PreviousMode) { /* Handle some internal commands */ diff --git a/sdk/include/ndk/kdfuncs.h b/sdk/include/ndk/kdfuncs.h index 21681a67674..0ab68c26bcd 100644 --- a/sdk/include/ndk/kdfuncs.h +++ b/sdk/include/ndk/kdfuncs.h @@ -34,11 +34,11 @@ NTSTATUS NTAPI KdSystemDebugControl( _In_ SYSDBG_COMMAND Command, - _In_ PVOID InputBuffer, + _In_reads_bytes_(InputBufferLength) PVOID InputBuffer, _In_ ULONG InputBufferLength, - _Out_ PVOID OutputBuffer, + _Out_writes_bytes_(OutputBufferLength) PVOID OutputBuffer, _In_ ULONG OutputBufferLength, - _Inout_ PULONG ReturnLength, + _Out_opt_ PULONG ReturnLength, _In_ KPROCESSOR_MODE PreviousMode ); @@ -74,12 +74,12 @@ NTSYSCALLAPI NTSTATUS NTAPI NtSystemDebugControl( - SYSDBG_COMMAND ControlCode, - PVOID InputBuffer, - ULONG InputBufferLength, - PVOID OutputBuffer, - ULONG OutputBufferLength, - PULONG ReturnLength + _In_ SYSDBG_COMMAND Command, + _In_reads_bytes_(InputBufferLength) PVOID InputBuffer, + _In_ ULONG InputBufferLength, + _Out_writes_bytes_(OutputBufferLength) PVOID OutputBuffer, + _In_ ULONG OutputBufferLength, + _Out_opt_ PULONG ReturnLength ); NTSYSAPI @@ -103,11 +103,11 @@ NTSYSAPI NTSTATUS NTAPI ZwSystemDebugControl( - SYSDBG_COMMAND ControlCode, - PVOID InputBuffer, - ULONG InputBufferLength, - PVOID OutputBuffer, - ULONG OutputBufferLength, - PULONG ReturnLength + _In_ SYSDBG_COMMAND Command, + _In_reads_bytes_(InputBufferLength) PVOID InputBuffer, + _In_ ULONG InputBufferLength, + _Out_writes_bytes_(OutputBufferLength) PVOID OutputBuffer, + _In_ ULONG OutputBufferLength, + _Out_opt_ PULONG ReturnLength ); #endif