diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-07-04 02:05:11 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-07-04 02:26:24 +0200 |
| commit | 89efcdb8cd95ea798187fe4062a73fa5d2fca456 (patch) | |
| tree | 5b87e340ffc7fb6ad8a8859750aa388487188f8f /src/Driver/DriveFilter.c | |
| parent | c2f6190627de27903264258c6ea8ee72199c0c81 (diff) | |
| download | VeraCrypt-89efcdb8cd95ea798187fe4062a73fa5d2fca456.tar.gz VeraCrypt-89efcdb8cd95ea798187fe4062a73fa5d2fca456.zip | |
Windows Driver: correctly save and restore extended processor state when performing AVX operations on Windows 7 and later. Enhance readability of code handling save/restore of floating point state.
Diffstat (limited to 'src/Driver/DriveFilter.c')
| -rw-r--r-- | src/Driver/DriveFilter.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/Driver/DriveFilter.c b/src/Driver/DriveFilter.c index d4d5e122..08bebe18 100644 --- a/src/Driver/DriveFilter.c +++ b/src/Driver/DriveFilter.c @@ -327,10 +327,14 @@ static void ComputeBootLoaderFingerprint(PDEVICE_OBJECT LowerDeviceObject, byte* status = TCReadDevice (LowerDeviceObject, ioBuffer, offset, TC_SECTOR_SIZE_BIOS); if (NT_SUCCESS (status)) { -#if !defined (_WIN64) - KFLOATING_SAVE floatingPointState; - NTSTATUS saveStatus = STATUS_SUCCESS; - if (HasISSE()|| (HasSSE2() && HasMMX())) + NTSTATUS saveStatus = STATUS_INVALID_PARAMETER; +#ifdef _WIN64 + XSTATE_SAVE SaveState; + if (g_isIntel && HasSAVX()) + saveStatus = KeSaveExtendedProcessorState(XSTATE_MASK_GSSE, &SaveState); +#else + KFLOATING_SAVE floatingPointState; + if (HasISSE() || (HasSSSE3() && HasMMX())) saveStatus = KeSaveFloatingPointState (&floatingPointState); #endif WHIRLPOOL_add (ioBuffer, TC_BOOT_SECTOR_PIM_VALUE_OFFSET, &whirlpool); @@ -367,8 +371,10 @@ static void ComputeBootLoaderFingerprint(PDEVICE_OBJECT LowerDeviceObject, byte* sha512_end (&BootLoaderFingerprint [WHIRLPOOL_DIGESTSIZE], &sha2); } -#if !defined (_WIN64) - if (NT_SUCCESS (saveStatus) && (HasISSE() || (HasSSE2() && HasMMX()))) + if (NT_SUCCESS (saveStatus)) +#ifdef _WIN64 + KeRestoreExtendedProcessorState(&SaveState); +#else KeRestoreFloatingPointState (&floatingPointState); #endif } |