diff options
| author |   Steve Dower <steve.dower@python.org> | 2020-01-31 13:12:20 +1100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2020-01-30 21:12:20 -0500 |
| commit | 51332c467ed2e07a191f903d554d0c54248e4d88 (patch) | |
| tree | 5174de3faab5a04b81cb7f52edc678c7c46bf1b0 | |
| parent | bpo-39421: Fix posible crash in heapq with custom comparison operators (GH-18... (diff) | |
| download | cpython-51332c467ed2e07a191f903d554d0c54248e4d88.tar.gz cpython-51332c467ed2e07a191f903d554d0c54248e4d88.tar.bz2 cpython-51332c467ed2e07a191f903d554d0c54248e4d88.zip | |
[3.6] bpo-39401: Avoid unsafe DLL load on Windows 7 and earlier (GH-18231) (GH-18233)
| -rw-r--r-- | Misc/NEWS.d/next/Security/2020-01-28-20-54-09.bpo-39401.he7h_A.rst | 1 | ||||
| -rw-r--r-- | PC/getpathp.c | 6 | ||||
| -rw-r--r-- | Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | 12 |
3 files changed, 15 insertions, 4 deletions
diff --git a/Misc/NEWS.d/next/Security/2020-01-28-20-54-09.bpo-39401.he7h_A.rst b/Misc/NEWS.d/next/Security/2020-01-28-20-54-09.bpo-39401.he7h_A.rst new file mode 100644 index 00000000000..5071e126b70 --- /dev/null +++ b/Misc/NEWS.d/next/Security/2020-01-28-20-54-09.bpo-39401.he7h_A.rst @@ -0,0 +1 @@ +Avoid unsafe load of ``api-ms-win-core-path-l1-1-0.dll`` at startup on Windows 7. diff --git a/PC/getpathp.c b/PC/getpathp.c index 880ea7b966e..e86c376fb4d 100644 --- a/PC/getpathp.c +++ b/PC/getpathp.c @@ -224,7 +224,8 @@ static void join(wchar_t *buffer, const wchar_t *stuff) { if (_PathCchCombineEx_Initialized == 0) { - HMODULE pathapi = LoadLibraryW(L"api-ms-win-core-path-l1-1-0.dll"); + HMODULE pathapi = LoadLibraryExW(L"api-ms-win-core-path-l1-1-0.dll", NULL, + LOAD_LIBRARY_SEARCH_SYSTEM32); if (pathapi) _PathCchCombineEx = (PPathCchCombineEx)GetProcAddress(pathapi, "PathCchCombineEx"); else @@ -249,7 +250,8 @@ static PPathCchCanonicalizeEx _PathCchCanonicalizeEx; static void canonicalize(wchar_t *buffer, const wchar_t *path) { if (_PathCchCanonicalizeEx_Initialized == 0) { - HMODULE pathapi = LoadLibraryW(L"api-ms-win-core-path-l1-1-0.dll"); + HMODULE pathapi = LoadLibraryExW(L"api-ms-win-core-path-l1-1-0.dll", NULL, + LOAD_LIBRARY_SEARCH_SYSTEM32); if (pathapi) { _PathCchCanonicalizeEx = (PPathCchCanonicalizeEx)GetProcAddress(pathapi, "PathCchCanonicalizeEx"); } diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp index e88981fc3ab..d14aeff1904 100644 --- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp +++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp @@ -3042,8 +3042,16 @@ private: } } else { if (IsWindows7SP1OrGreater()) { - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Target OS is Windows 7 SP1 or later"); - return; + HMODULE hKernel32 = GetModuleHandleW(L"kernel32"); + if (hKernel32 && !GetProcAddress(hKernel32, "AddDllDirectory")) { + BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Detected Windows 7 SP1 without KB2533623"); + BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "KB2533623 update is required to continue."); + /* The "MissingSP1" error also specifies updates are required */ + LocGetString(_wixLoc, L"#(loc.FailureWin7MissingSP1)", &pLocString); + } else { + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Target OS is Windows 7 SP1 or later"); + return; + } } else if (IsWindows7OrGreater()) { BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Detected Windows 7 RTM"); BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Service Pack 1 is required to continue installation"); |