dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bug #1125: Don't load modules from the application nor current directory.

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6645 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2015-11-28 13:32:54 +00:00
parent 2316018c0c
commit e83197997e
4 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Docs/src/history.but
View file

@ -12,7 +12,7 @@ Released on ? ?th, 201?
\b FileReadUTF16LE now skips the optional BOM at the start of a file \b FileReadUTF16LE now skips the optional BOM at the start of a file
\b SHFolder.dll is loaded with full path to prevent dll hijacking \b LoadLibrary security hardening to prevent dll hijacking
\S2{} Minor Changes \S2{} Minor Changes

16
Source/exehead/Main.c
View file

@ -28,6 +28,12 @@
#include "exec.h" #include "exec.h"
#include "plugin.h" #include "plugin.h"
#ifndef LOAD_LIBRARY_SEARCH_USER_DIRS
#define LOAD_LIBRARY_SEARCH_USER_DIRS 0x00000400
#endif
#ifndef LOAD_LIBRARY_SEARCH_SYSTEM32
#define LOAD_LIBRARY_SEARCH_SYSTEM32 0x00000800
#endif
#ifndef SHTDN_REASON_FLAG_PLANNED #ifndef SHTDN_REASON_FLAG_PLANNED
#define SHTDN_REASON_FLAG_PLANNED 0x80000000 #define SHTDN_REASON_FLAG_PLANNED 0x80000000
#endif #endif
@ -98,6 +104,16 @@ EXTERN_C void NSISWinMainNOCRT()
} }
#endif #endif
{
// bug #1125: Don't load modules from the application nor current directory.
// SetDefaultDllDirectories() allows us to restrict implicitly loaded and
// dynamically loaded modules (with relative paths) to just
// %windir%\System32 and directories added with AddDllDirectory().
// This prevents DLL search order attacks (CAPEC-471).
FARPROC fp = myGetProcAddress(MGA_SetDefaultDllDirectories);
if (fp) ((BOOL(WINAPI*)(DWORD))fp)(LOAD_LIBRARY_SEARCH_SYSTEM32|LOAD_LIBRARY_SEARCH_USER_DIRS);
}
// Because myGetProcAddress now loads dlls with a full path // Because myGetProcAddress now loads dlls with a full path
// under GetSystemDirectory() the previous issues in <= v3.0b2 with // under GetSystemDirectory() the previous issues in <= v3.0b2 with
// 'SetOutPath' and/or 'File "shfolder.dll"' no longer apply. // 'SetOutPath' and/or 'File "shfolder.dll"' no longer apply.

4
Source/exehead/util.c
View file

@ -1063,6 +1063,7 @@ struct MGA_FUNC
struct MGA_FUNC MGA_FUNCS[] = { struct MGA_FUNC MGA_FUNCS[] = {
#ifdef _UNICODE #ifdef _UNICODE
{"KERNEL32", "SetDefaultDllDirectories"},
#ifndef _WIN64 #ifndef _WIN64
{"KERNEL32", "GetDiskFreeSpaceExW"}, {"KERNEL32", "GetDiskFreeSpaceExW"},
{"KERNEL32", "GetUserDefaultUILanguage"}, {"KERNEL32", "GetUserDefaultUILanguage"},
@ -1076,6 +1077,7 @@ struct MGA_FUNC MGA_FUNCS[] = {
{"VERSION", "VerQueryValueW"} {"VERSION", "VerQueryValueW"}
}; };
#else #else
{"KERNEL32", "SetDefaultDllDirectories"},
{"KERNEL32", "GetDiskFreeSpaceExA"}, {"KERNEL32", "GetDiskFreeSpaceExA"},
{"KERNEL32", "GetUserDefaultUILanguage"}, {"KERNEL32", "GetUserDefaultUILanguage"},
{"ADVAPI32", "RegDeleteKeyExA"}, {"ADVAPI32", "RegDeleteKeyExA"},
@ -1096,7 +1098,7 @@ struct MGA_FUNC MGA_FUNCS[] = {
* @param func Enum value that indexes the MGA_FUNCS array. * @param func Enum value that indexes the MGA_FUNCS array.
* @return Pointer to the function identified by the enum value. * @return Pointer to the function identified by the enum value.
*/ */
void * NSISCALL myGetProcAddress(const enum myGetProcAddressFunctions func) void* NSISCALL myGetProcAddress(const enum myGetProcAddressFunctions func)
{ {
#ifdef UNICODE #ifdef UNICODE
static const TCHAR dllpathfmt[] = _T("%s%hs.dll"); // Strings in MGA_FUNC are always ANSI static const TCHAR dllpathfmt[] = _T("%s%hs.dll"); // Strings in MGA_FUNC are always ANSI

5
Source/exehead/util.h
View file

@ -119,6 +119,7 @@ void NSISCALL mini_memcpy(void *out, const void *in, UINT_PTR cb);
#endif #endif
enum myGetProcAddressFunctions { enum myGetProcAddressFunctions {
MGA_SetDefaultDllDirectories, // Win8+ but exists on Vista/2008/7/2008R2 if KB2533623 is installed
#ifndef _WIN64 #ifndef _WIN64
MGA_GetDiskFreeSpaceEx, MGA_GetDiskFreeSpaceEx,
MGA_GetUserDefaultUILanguage, MGA_GetUserDefaultUILanguage,
@ -127,12 +128,12 @@ enum myGetProcAddressFunctions {
MGA_InitiateShutdown, MGA_InitiateShutdown,
MGA_SHAutoComplete, // x64 can link to shlwapi directly but as long as MGA_SHGetFolderPath is used we can stick with myGetProcAddress MGA_SHAutoComplete, // x64 can link to shlwapi directly but as long as MGA_SHGetFolderPath is used we can stick with myGetProcAddress
MGA_SHGetFolderPath, // TODO: This can probably call something else directly on x64 MGA_SHGetFolderPath, // TODO: This can probably call something else directly on x64
MGA_GetFileVersionInfoSize, // Version.dll exists in all Windows versions, it is delay loaded to avoid dll hijacking [bug #1125] MGA_GetFileVersionInfoSize, // Version.dll exists in all Windows versions, it is delay loaded to avoid DLL hijacking [bug #1125]
MGA_GetFileVersionInfo, MGA_GetFileVersionInfo,
MGA_VerQueryValue MGA_VerQueryValue
}; };
void * NSISCALL myGetProcAddress(const enum myGetProcAddressFunctions func); void*NSISCALL myGetProcAddress(const enum myGetProcAddressFunctions func);
void NSISCALL MessageLoop(UINT uCheckedMsg); void NSISCALL MessageLoop(UINT uCheckedMsg);
/** /**