diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-07-03 01:54:24 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-07-03 01:55:45 +0200 |
| commit | 840756ead10e6c0914ba43fe0631296703880c48 (patch) | |
| tree | 3a3c2171b2eb8b32ce7cc9dd791eb89dc3f9930f /src/Common | |
| parent | f78242fac6e385c40ec07b7a29bd460ab86a2d63 (diff) | |
| download | VeraCrypt-840756ead10e6c0914ba43fe0631296703880c48.tar.gz VeraCrypt-840756ead10e6c0914ba43fe0631296703880c48.zip | |
Windows: workaround for some cases where the system return ERROR_INVALID_PARAMETER when we try to write EFI bootloader files into ESP partition.
Diffstat (limited to 'src/Common')
| -rw-r--r-- | src/Common/BootEncryption.cpp | 43 | ||||
| -rw-r--r-- | src/Common/BootEncryption.h | 2 |
2 files changed, 36 insertions, 9 deletions
diff --git a/src/Common/BootEncryption.cpp b/src/Common/BootEncryption.cpp index 757c14a4..40e9e77b 100644 --- a/src/Common/BootEncryption.cpp +++ b/src/Common/BootEncryption.cpp @@ -474,12 +474,12 @@ namespace VeraCrypt #endif // SETUP - File::File (wstring path, bool readOnly, bool create) : Elevated (false), FileOpen (false), ReadOnly (readOnly), LastError(0) + File::File (wstring path, bool readOnly, bool create, bool useNormalAttributes) : Elevated (false), FileOpen (false), ReadOnly (readOnly), LastError(0) { Handle = CreateFile (path.c_str(), readOnly ? GENERIC_READ : GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, create ? CREATE_ALWAYS : OPEN_EXISTING, - FILE_FLAG_RANDOM_ACCESS | FILE_FLAG_WRITE_THROUGH, NULL); + useNormalAttributes? FILE_ATTRIBUTE_NORMAL : (FILE_FLAG_RANDOM_ACCESS | FILE_FLAG_WRITE_THROUGH), NULL); if (Handle != INVALID_HANDLE_VALUE) { @@ -2128,13 +2128,27 @@ namespace VeraCrypt GetVolumeESP(pathESP); if (szFilePath[0] != L'\\') pathESP += L"\\"; - File f(pathESP + szFilePath, false, true); + fileContent.resize(dwSize); if (bAddUTF8BOM) memcpy (fileContent.data(), "\xEF\xBB\xBF", 3); memcpy (&fileContent[dwOffset], pbData, dwDataLen); - f.Write(fileContent.data(), dwSize); - f.Close(); + + try + { + File f(pathESP + szFilePath, false, true); + f.Write(fileContent.data(), dwSize); + f.Close(); + } + catch (SystemException &e) + { + if (e.ErrorCode != ERROR_INVALID_PARAMETER) + throw; + // try again with normal attributes + File f(pathESP + szFilePath, false, true, true); + f.Write(fileContent.data(), dwSize); + f.Close(); + } } EfiBoot::EfiBoot() { @@ -2422,9 +2436,22 @@ namespace VeraCrypt void EfiBoot::SaveFile(const wchar_t* name, byte* data, DWORD size) { wstring path = EfiBootPartPath; path += name; - File f(path, false, true); - f.Write(data, size); - f.Close(); + try + { + File f(path, false, true); + f.Write(data, size); + f.Close(); + } + catch (SystemException &e) + { + if (e.ErrorCode != ERROR_INVALID_PARAMETER) + throw; + + // try again with normal attributes + File f(path, false, true, true); + f.Write(data, size); + f.Close(); + } } void EfiBoot::GetFileSize(const wchar_t* name, unsigned __int64& size) { diff --git a/src/Common/BootEncryption.h b/src/Common/BootEncryption.h index aaaed301..0f8e993b 100644 --- a/src/Common/BootEncryption.h +++ b/src/Common/BootEncryption.h @@ -37,7 +37,7 @@ namespace VeraCrypt { public: File () : Elevated (false), FileOpen (false), ReadOnly (false), FilePointerPosition(0), Handle(INVALID_HANDLE_VALUE), IsDevice(false), LastError(0) { } - File (wstring path,bool readOnly = false, bool create = false); + File (wstring path,bool readOnly = false, bool create = false, bool useNormalAttributes = false); virtual ~File () { Close(); } void CheckOpened (const char* srcPos) { if (!FileOpen) { SetLastError (LastError); throw SystemException (srcPos);} } |