[ros-diffs] [navaraf] 17072: Protect NtQuerySystemInformation with SEH.

Protect NtQuerySystemInformation with SEH.
Modified: trunk/reactos/ntoskrnl/ex/error.c
Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c
  _____  

Modified: trunk/reactos/ntoskrnl/ex/error.c
--- trunk/reactos/ntoskrnl/ex/error.c	2005-08-05 15:41:20 UTC (rev
17071)
+++ trunk/reactos/ntoskrnl/ex/error.c	2005-08-05 15:45:14 UTC (rev
17072)
@@ -82,7 +82,15 @@

 STDCALL
 ExSystemExceptionFilter(VOID)
 {
+    /*
+     * The PreviousMode always happens to be KernelMode since the
exception
+     * happens in kenrel mode. FIXME: Is this correct behaviour?
+     */
+#if 0
     return KeGetPreviousMode() != KernelMode ?
EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH;
+#else
+    return EXCEPTION_EXECUTE_HANDLER;
+#endif
 }
 
 /*
  _____  

Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c
--- trunk/reactos/ntoskrnl/ex/sysinfo.c	2005-08-05 15:41:20 UTC (rev
17071)
+++ trunk/reactos/ntoskrnl/ex/sysinfo.c	2005-08-05 15:45:14 UTC (rev
17072)
@@ -1510,45 +1510,39 @@

  */
 NTSTATUS STDCALL
 NtQuerySystemInformation (IN SYSTEM_INFORMATION_CLASS
SystemInformationClass,
-			  OUT PVOID UnsafeSystemInformation,
+			  OUT PVOID SystemInformation,
 			  IN ULONG Length,
 			  OUT PULONG UnsafeResultLength)
 {
   KPROCESSOR_MODE PreviousMode;
   ULONG ResultLength;
-  PVOID SystemInformation;
-  NTSTATUS FStatus;
+  NTSTATUS FStatus = STATUS_NOT_IMPLEMENTED;
 
   PAGED_CODE();
   
   PreviousMode = ExGetPreviousMode();
   
-
-/*	DPRINT("NtQuerySystemInformation Start. Class:%d\n",
-					SystemInformationClass );
-*/
-  /*if (ExGetPreviousMode() == KernelMode)
-    {*/
-      SystemInformation = UnsafeSystemInformation;
-    /*}
-  else
+  _SEH_TRY
     {
-      SystemInformation = ExAllocatePool(NonPagedPool, Length);
-      if (SystemInformation == NULL)
-	{
-	  return(STATUS_NO_MEMORY);
-	}
-    }*/
+      if (PreviousMode == UserMode)
+        {
+          /* SystemKernelDebuggerInformation needs only BOOLEAN
alignment */
+          ProbeForWrite(SystemInformation, Length, 1); 
+          if (UnsafeResultLength != NULL)
+            ProbeForWrite(UnsafeResultLength, sizeof(ULONG),
sizeof(ULONG));
+        }
 
-  /* Clear user buffer. */
-  RtlZeroMemory(SystemInformation, Length);
+      /* Clear user buffer. */
+      RtlZeroMemory(SystemInformation, Length);
 
-  /*
-   * Check the request is valid.
-   */
-  if ((SystemInformationClass >= SystemBasicInformation) &&
-      (SystemInformationClass < SystemInformationClassMax))
-    {
+      /*
+       * Check the request is valid.
+       */
+      if (SystemInformationClass >= SystemInformationClassMax)
+        {
+          return (STATUS_INVALID_INFO_CLASS);
+        }
+
       if (NULL != CallQS [SystemInformationClass].Query)
 	{
 	  /*
@@ -1557,17 +1551,6 @@
 	  FStatus = CallQS
[SystemInformationClass].Query(SystemInformation,
 							  Length,
 
&ResultLength);
-	  /*if (ExGetPreviousMode() != KernelMode)
-	    {
-	      Status = MmCopyToCaller(UnsafeSystemInformation,
-				      SystemInformation,
-				      Length);
-	      ExFreePool(SystemInformation);
-	      if (!NT_SUCCESS(Status))
-		{
-		  return(Status);
-		}
-	    }*/
 	  if (NT_SUCCESS(FStatus) && UnsafeResultLength != NULL)
 	    {
               if (PreviousMode != KernelMode)
@@ -1575,9 +1558,6 @@
                   FStatus = STATUS_SUCCESS;
                   _SEH_TRY
                     {
-                      ProbeForWrite(UnsafeResultLength,
-                                    sizeof(ULONG),
-                                    sizeof(ULONG));
                       *UnsafeResultLength = ResultLength;
                     }
                   _SEH_EXCEPT(_SEH_ExSystemExceptionFilter)
@@ -1591,10 +1571,15 @@
                   *UnsafeResultLength = ResultLength;
                 }
 	    }
-	  return(FStatus);
 	}
     }
-  return (STATUS_INVALID_INFO_CLASS);
+  _SEH_EXCEPT(_SEH_ExSystemExceptionFilter)
+    {
+      FStatus = _SEH_GetExceptionCode();
+    }
+  _SEH_END;
+
+  return (FStatus);
 }