[ros-diffs] [tkreuzer] 50099: [NTDLL] Raise harderror and terminate process when the image is of a foreign architecture.

Author: tkreuzer
Date: Wed Dec 22 16:19:40 2010
New Revision: 50099

URL: http://svn.reactos.org/svn/reactos?rev=50099&view=rev
Log:
[NTDLL]
Raise harderror and terminate process when the image is of a foreign architecture.

Modified:
    trunk/reactos/dll/ntdll/ldr/startup.c

Modified: trunk/reactos/dll/ntdll/ldr/startup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re…
==============================================================================
--- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Wed Dec 22 16:19:40 2010
@@ -330,6 +330,7 @@
     SYSTEM_BASIC_INFORMATION SystemInformation;
     NTSTATUS Status;
     PVOID BaseAddress = SystemArgument1;
+    ULONG ErrorResponse;
 
     DPRINT("LdrpInit()\n");
     DPRINT("Peb %p\n", Peb);
@@ -344,14 +345,23 @@
 
     /*  If MZ header exists  */
     PEDosHeader = (PIMAGE_DOS_HEADER) ImageBase;
+    NTHeaders = (PIMAGE_NT_HEADERS)((ULONG_PTR)ImageBase + PEDosHeader->e_lfanew);
     DPRINT("PEDosHeader %p\n", PEDosHeader);
 
     if (PEDosHeader->e_magic != IMAGE_DOS_SIGNATURE ||
         PEDosHeader->e_lfanew == 0L ||
-        *(PULONG)((PUCHAR)ImageBase + PEDosHeader->e_lfanew) != IMAGE_NT_SIGNATURE)
+        NTHeaders->Signature != IMAGE_NT_SIGNATURE)
     {
         DPRINT1("Image has bad header\n");
         ZwTerminateProcess(NtCurrentProcess(), STATUS_INVALID_IMAGE_FORMAT);
+    }
+
+    if (NTHeaders->FileHeader.Machine != IMAGE_FILE_MACHINE_NATIVE)
+    {
+        DPRINT1("Image is for a foreign architecture (0x%x).\n",
+                NTHeaders->FileHeader.Machine);
+        NtRaiseHardError(STATUS_IMAGE_MACHINE_TYPE_MISMATCH, 0, 0, NULL, OptionOk,
&ErrorResponse);
+        ZwTerminateProcess(NtCurrentProcess(), STATUS_IMAGE_MACHINE_TYPE_MISMATCH);
     }
 
     /* normalize process parameters */
@@ -363,8 +373,6 @@
                      Peb->UnicodeCaseTableData,
                      &NlsTable);
     RtlResetRtlTranslations(&NlsTable);
-
-    NTHeaders = (PIMAGE_NT_HEADERS)((ULONG_PTR)ImageBase + PEDosHeader->e_lfanew);
 
     /* Get number of processors */
     DPRINT("Here\n");