Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 09:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTDLL]: Fix busted up LdrpCreateDllSection function, checking for the wrong things completely for Safer support, and also messing up the failure/success paths. Based on a find by arty.

Browse source 
svn path=/trunk/; revision=52588
This commit is contained in:
Alex Ionescu 2011-07-09 20:33:29 +00:00
parent 97e63bf1b7
commit d544cad512
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
reactos/dll/ntdll/ldr/ldrutils.c
View file

@ -436,7 +436,7 @@ LdrpCreateDllSection(IN PUNICODE_STRING FullName,
/* Check for Safer restrictions */
if (DllCharacteristics &&
!(*DllCharacteristics & IMAGE_DLLCHARACTERISTICS_WX86_DLL))
!(*DllCharacteristics & IMAGE_FILE_SYSTEM))
{
/* Make sure it's executable */
Status = ZwQuerySection(*SectionHandle,
@ -446,10 +446,10 @@ LdrpCreateDllSection(IN PUNICODE_STRING FullName,
NULL);
if (NT_SUCCESS(Status))
{
/* Check if it's executable */
if (SectionImageInfo.ImageContainsCode)
/* Bypass the check for .NET images */
if (!(SectionImageInfo.LoaderFlags & IMAGE_LOADER_FLAGS_COMPLUS))
{
/* It is, check safer */
/* Check with Safer */
Status = LdrpCodeAuthzCheckDllAllowed(FullName, DllHandle);
if (!NT_SUCCESS(Status) && (Status != STATUS_NOT_FOUND))
{
@ -459,18 +459,19 @@ LdrpCreateDllSection(IN PUNICODE_STRING FullName,
DPRINT1("LDR: Loading of (%wZ) blocked by Winsafer\n",
&FullName);
}
}
else
{
/* We're fine, return normally */
goto Quickie;
/* Failure case, close section handle */
NtClose(*SectionHandle);
*SectionHandle = NULL;
}
}
}
/* Failure case, close section handle */
NtClose(*SectionHandle);
*SectionHandle = NULL;
else
{
/* Failure case, close section handle */
NtClose(*SectionHandle);
*SectionHandle = NULL;
}
}
Quickie: