Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-12 12:28:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOSKRNL]

Browse source 
NtQuerySystemInformation: check for correct alignment

svn path=/trunk/; revision=68390
This commit is contained in:
Christoph von Wittich 2015-07-12 08:20:13 +00:00
parent d92f46f3a4
commit 0c5abacf52
1 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

35
reactos/ntoskrnl/ex/sysinfo.c
View file

@ -2308,7 +2308,7 @@ struct _QSSI_CALLS
{ {
NTSTATUS (* Query) (PVOID,ULONG,PULONG); NTSTATUS (* Query) (PVOID,ULONG,PULONG);
NTSTATUS (* Set) (PVOID,ULONG); NTSTATUS (* Set) (PVOID,ULONG);
ULONG Alignment;
} QSSI_CALLS; } QSSI_CALLS;
// QS Query & Set // QS Query & Set
@ -2316,9 +2316,12 @@ struct _QSSI_CALLS
// XS Set // XS Set
// XX unknown behaviour // XX unknown behaviour
// //
#define SI_QS(n) {QSI_USE(n),SSI_USE(n)} #define SI_QS(n) {QSI_USE(n),SSI_USE(n),TYPE_ALIGNMENT(ULONG)}
#define SI_QX(n) {QSI_USE(n),NULL} #define SI_QX(n) {QSI_USE(n),NULL,TYPE_ALIGNMENT(ULONG)}
#define SI_XS(n) {NULL,SSI_USE(n)} #define SI_XS(n) {NULL,SSI_USE(n),TYPE_ALIGNMENT(ULONG)}
#define SI_QS_ALIGN(n,a) {QSI_USE(n),SSI_USE(n),a}
#define SI_QX_ALIGN(n,a) {QSI_USE(n),NULL,a}
#define SI_XS_ALIGN(n,a) {NULL,SSI_USE(n),a}
#define SI_XX(n) {NULL,NULL} #define SI_XX(n) {NULL,NULL}
static static
@ -2360,7 +2363,7 @@ CallQS [] =
SI_QX(SystemCrashDumpInformation), SI_QX(SystemCrashDumpInformation),
SI_QX(SystemExceptionInformation), SI_QX(SystemExceptionInformation),
SI_QX(SystemCrashDumpStateInformation), SI_QX(SystemCrashDumpStateInformation),
SI_QX(SystemKernelDebuggerInformation), SI_QX_ALIGN(SystemKernelDebuggerInformation, TYPE_ALIGNMENT(BOOLEAN)),
SI_QX(SystemContextSwitchInformation), SI_QX(SystemContextSwitchInformation),
SI_QS(SystemRegistryQuotaInformation), SI_QS(SystemRegistryQuotaInformation),
SI_XS(SystemExtendServiceTableInformation), SI_XS(SystemExtendServiceTableInformation),
@ -2411,17 +2414,6 @@ NtQuerySystemInformation(IN SYSTEM_INFORMATION_CLASS SystemInformationClass,
_SEH2_TRY _SEH2_TRY
{ {
if (PreviousMode != KernelMode)
{
/* SystemKernelDebuggerInformation needs only BOOLEAN alignment */
ProbeForWrite(SystemInformation, Length, 1);
if (UnsafeResultLength != NULL)
ProbeForWriteUlong(UnsafeResultLength);
}
if (UnsafeResultLength)
*UnsafeResultLength = 0;
/* /*
* Check if the request is valid. * Check if the request is valid.
*/ */
@ -2430,6 +2422,17 @@ NtQuerySystemInformation(IN SYSTEM_INFORMATION_CLASS SystemInformationClass,
_SEH2_YIELD(return STATUS_INVALID_INFO_CLASS); _SEH2_YIELD(return STATUS_INVALID_INFO_CLASS);
} }
if (PreviousMode != KernelMode)
{
/* SystemKernelDebuggerInformation needs only BOOLEAN alignment */
ProbeForWrite(SystemInformation, Length, CallQS[SystemInformationClass].Alignment);
if (UnsafeResultLength != NULL)
ProbeForWriteUlong(UnsafeResultLength);
}
if (UnsafeResultLength)
*UnsafeResultLength = 0;
if (NULL != CallQS [SystemInformationClass].Query) if (NULL != CallQS [SystemInformationClass].Query)
{ {
/* /*