1 files changed, 111 insertions, 26 deletions
diff --git a/src/Format/InPlace.c b/src/Format/InPlace.c
index 7117a8a4..b1483631 100644
--- a/src/Format/InPlace.c
+++ b/src/Format/InPlace.c
@@ -89,6 +89,8 @@ static __int64 NewFileSysSizeAfterShrink (HANDLE dev, const wchar_t *devicePath,
 	}
 
 	if (	(ntfsVolData.NumberSectors.QuadPart <= 0)
+		||	(ntfsVolData.BytesPerSector == 0)
+		||	(ntfsVolData.BytesPerSector >= (DWORD) UINT_MAX)
 		||	(ntfsVolData.NumberSectors.QuadPart > (INT64_MAX / (__int64) ntfsVolData.BytesPerSector)) // overflow test
 		)
 	{
@@ -591,7 +593,7 @@ int EncryptPartitionInPlaceBegin (volatile FORMAT_VOL_PARAMETERS *volParams, vol
 
 		offset.QuadPart = TC_VOLUME_DATA_OFFSET + dataAreaSize;
 
-		if (!SetFilePointerEx (dev, offset, NULL, FILE_BEGIN))
+		if (!MoveFilePointer (dev, offset))
 		{
 			nStatus = ERR_OS_ERROR;
 			goto closing_seq;
@@ -637,7 +639,7 @@ int EncryptPartitionInPlaceBegin (volatile FORMAT_VOL_PARAMETERS *volParams, vol
 
 		offset.QuadPart += TC_HIDDEN_VOLUME_HEADER_OFFSET;
 
-		if (!SetFilePointerEx (dev, offset, NULL, FILE_BEGIN))
+		if (!MoveFilePointer (dev, offset))
 		{
 			nStatus = ERR_OS_ERROR;
 			goto closing_seq;
@@ -774,6 +776,9 @@ int EncryptPartitionInPlaceResume (HANDLE dev,
 	int pim = volParams->pim;
 	DISK_GEOMETRY driveGeometry;
 	HWND hwndDlg = volParams->hwndDlg;
+#ifdef _WIN64
+	BOOL bIsRamEncryptionEnabled = IsRamEncryptionEnabled();
+#endif
 
 
 	bInPlaceEncNonSysResumed = TRUE;
@@ -870,7 +875,7 @@ int EncryptPartitionInPlaceResume (HANDLE dev,
 		goto closing_seq;
 
 #ifdef _WIN64
-	if (IsRamEncryptionEnabled ())
+	if (bIsRamEncryptionEnabled)
 	{
 		VcProtectKeys (masterCryptoInfo, VcGetEncryptionID (masterCryptoInfo));
 		VcProtectKeys (headerCryptoInfo, VcGetEncryptionID (headerCryptoInfo));
@@ -911,7 +916,7 @@ inplace_enc_read:
 
 		offset.QuadPart = masterCryptoInfo->EncryptedAreaStart.Value - workChunkSize - TC_VOLUME_DATA_OFFSET;
 
-		if (SetFilePointerEx (dev, offset, NULL, FILE_BEGIN) == 0)
+		if (MoveFilePointer (dev, offset) == 0)
 		{
 			nStatus = ERR_OS_ERROR;
 			goto closing_seq;
@@ -1002,14 +1007,14 @@ inplace_enc_read:
 					memcpy (wipeRandCharsUpdate, wipeBuffer, sizeof (wipeRandCharsUpdate));
 				}
 
-				if (SetFilePointerEx (dev, offset, NULL, FILE_BEGIN) == 0
+				if (MoveFilePointer (dev, offset) == 0
 					|| WriteFile (dev, wipeBuffer, workChunkSize, &n, NULL) == 0)
 				{
 					// Write error
 					dwError = GetLastError();
 
 					// Undo failed write operation
-					if (workChunkSize > TC_VOLUME_DATA_OFFSET && SetFilePointerEx (dev, offset, NULL, FILE_BEGIN))
+					if (workChunkSize > TC_VOLUME_DATA_OFFSET && MoveFilePointer (dev, offset))
 					{
 						DecryptDataUnits ((byte *) buf, &unitNo, workChunkSize / ENCRYPTION_DATA_UNIT_SIZE, masterCryptoInfo);
 						WriteFile (dev, buf + TC_VOLUME_DATA_OFFSET, workChunkSize - TC_VOLUME_DATA_OFFSET, &n, NULL);
@@ -1029,7 +1034,7 @@ inplace_enc_read:
 
 		offset.QuadPart = masterCryptoInfo->EncryptedAreaStart.Value - workChunkSize;
 
-		if (SetFilePointerEx (dev, offset, NULL, FILE_BEGIN) == 0)
+		if (MoveFilePointer (dev, offset) == 0)
 		{
 			nStatus = ERR_OS_ERROR;
 			goto closing_seq;
@@ -1041,7 +1046,7 @@ inplace_enc_read:
 			dwError = GetLastError();
 
 			// Undo failed write operation
-			if (workChunkSize > TC_VOLUME_DATA_OFFSET && SetFilePointerEx (dev, offset, NULL, FILE_BEGIN))
+			if (workChunkSize > TC_VOLUME_DATA_OFFSET && MoveFilePointer (dev, offset))
 			{
 				DecryptDataUnits ((byte *) buf, &unitNo, workChunkSize / ENCRYPTION_DATA_UNIT_SIZE, masterCryptoInfo);
 				WriteFile (dev, buf + TC_VOLUME_DATA_OFFSET, workChunkSize - TC_VOLUME_DATA_OFFSET, &n, NULL);
@@ -1097,6 +1102,19 @@ inplace_enc_read:
 		{
 			PCRYPTO_INFO dummyInfo = NULL;
 
+#ifdef _WIN64
+			CRYPTO_INFO tmpCI;
+			PCRYPTO_INFO cryptoInfoBackup = NULL;
+			if (bIsRamEncryptionEnabled)
+			{
+				VirtualLock (&tmpCI, sizeof(tmpCI));
+				memcpy (&tmpCI, masterCryptoInfo, sizeof (CRYPTO_INFO));
+				VcUnprotectKeys (&tmpCI, VcGetEncryptionID (masterCryptoInfo));
+				cryptoInfoBackup = masterCryptoInfo;
+				masterCryptoInfo = &tmpCI;
+			}
+#endif
+
 			nStatus = CreateVolumeHeaderInMemory (hwndDlg, FALSE,
 				header,
 				headerCryptoInfo->ea,
@@ -1115,22 +1133,50 @@ inplace_enc_read:
 				masterCryptoInfo->SectorSize,
 				wipeAlgorithm == TC_WIPE_NONE ? FALSE : (wipePass < PRAND_HEADER_WIPE_PASSES - 1));
 
+#ifdef _WIN64
+			if (bIsRamEncryptionEnabled)
+			{
+				masterCryptoInfo = cryptoInfoBackup;
+				burn (&tmpCI, sizeof (CRYPTO_INFO));
+				VirtualUnlock (&tmpCI, sizeof(tmpCI));
+			}
+#endif
+
 			if (nStatus != ERR_SUCCESS)
 				goto closing_seq;
 
 
 			offset.QuadPart = TC_VOLUME_HEADER_OFFSET;
 
-			if (SetFilePointerEx (dev, offset, NULL, FILE_BEGIN) == 0
+			if (MoveFilePointer (dev, offset) == 0
 				|| !WriteEffectiveVolumeHeader (TRUE, dev, (byte *) header))
 			{
 				nStatus = ERR_OS_ERROR;
 				goto closing_seq;
 			}
 
+#ifdef _WIN64
+			if (bIsRamEncryptionEnabled)
+			{
+				VirtualLock (&tmpCI, sizeof(tmpCI));
+				memcpy (&tmpCI, headerCryptoInfo, sizeof (CRYPTO_INFO));
+				VcUnprotectKeys (&tmpCI, VcGetEncryptionID (headerCryptoInfo));
+				cryptoInfoBackup = headerCryptoInfo;
+				headerCryptoInfo = &tmpCI;
+			}
+#endif
 			// Fill the reserved sectors of the header area with random data
 			nStatus = WriteRandomDataToReservedHeaderAreas (hwndDlg, dev, headerCryptoInfo, masterCryptoInfo->VolumeSize.Value, TRUE, FALSE);
 
+#ifdef _WIN64
+			if (bIsRamEncryptionEnabled)
+			{
+				headerCryptoInfo = cryptoInfoBackup;
+				burn (&tmpCI, sizeof (CRYPTO_INFO));
+				VirtualUnlock (&tmpCI, sizeof(tmpCI));
+			}
+#endif
+
 			if (nStatus != ERR_SUCCESS)
 				goto closing_seq;
 
@@ -1161,7 +1207,7 @@ inplace_enc_read:
 
 			offset.QuadPart += TC_HIDDEN_VOLUME_HEADER_OFFSET;
 
-			if (SetFilePointerEx (dev, offset, NULL, FILE_BEGIN) == 0
+			if (MoveFilePointer (dev, offset) == 0
 				|| !WriteEffectiveVolumeHeader (TRUE, dev, (byte *) header))
 			{
 				nStatus = ERR_OS_ERROR;
@@ -1290,6 +1336,9 @@ int DecryptPartitionInPlace (volatile FORMAT_VOL_PARAMETERS *volParams, volatile
 	int pkcs5_prf = volParams->pkcs5;
 	int pim = volParams->pim;
 	DISK_GEOMETRY driveGeometry;
+#ifdef _WIN64
+	BOOL bIsRamEncryptionEnabled = IsRamEncryptionEnabled();
+#endif
 
 
 	buf = (char *) TCalloc (TC_MAX_NONSYS_INPLACE_ENC_WORK_CHUNK_SIZE);
@@ -1397,7 +1446,7 @@ int DecryptPartitionInPlace (volatile FORMAT_VOL_PARAMETERS *volParams, volatile
 		goto closing_seq;
 
 #ifdef _WIN64
-	if (IsRamEncryptionEnabled ())
+	if (bIsRamEncryptionEnabled)
 	{
 		VcProtectKeys (masterCryptoInfo, VcGetEncryptionID (masterCryptoInfo));
 		VcProtectKeys (headerCryptoInfo, VcGetEncryptionID (headerCryptoInfo));
@@ -1495,7 +1544,7 @@ int DecryptPartitionInPlace (volatile FORMAT_VOL_PARAMETERS *volParams, volatile
 
 		offset.QuadPart = workChunkStartByteOffset;
 
-		if (SetFilePointerEx (dev, offset, NULL, FILE_BEGIN) == 0)
+		if (MoveFilePointer (dev, offset) == 0)
 		{
 			nStatus = ERR_OS_ERROR;
 			goto closing_seq;
@@ -1529,7 +1578,7 @@ int DecryptPartitionInPlace (volatile FORMAT_VOL_PARAMETERS *volParams, volatile
 
 					for (tmpSectorCount = workChunkSize / sectorSize; tmpSectorCount > 0; --tmpSectorCount)
 					{
-						if (SetFilePointerEx (dev, tmpSectorOffset, NULL, FILE_BEGIN) == 0)
+						if (MoveFilePointer (dev, tmpSectorOffset) == 0)
 						{
 							nStatus = ERR_OS_ERROR;
 							goto closing_seq;
@@ -1591,7 +1640,7 @@ int DecryptPartitionInPlace (volatile FORMAT_VOL_PARAMETERS *volParams, volatile
 
 		offset.QuadPart = workChunkStartByteOffset - TC_VOLUME_DATA_OFFSET;
 
-		if (SetFilePointerEx (dev, offset, NULL, FILE_BEGIN) == 0)
+		if (MoveFilePointer (dev, offset) == 0)
 		{
 			nStatus = ERR_OS_ERROR;
 			goto closing_seq;
@@ -1675,7 +1724,7 @@ int DecryptPartitionInPlace (volatile FORMAT_VOL_PARAMETERS *volParams, volatile
 			offset.QuadPart <= deviceSize - sectorSize;
 			offset.QuadPart += sectorSize)
 		{
-			if (SetFilePointerEx (dev, offset, NULL, FILE_BEGIN) == 0)
+			if (MoveFilePointer (dev, offset) == 0)
 			{
 				nStatus = ERR_OS_ERROR;
 				goto closing_seq;
@@ -1799,6 +1848,9 @@ int FastVolumeHeaderUpdate (HANDLE dev, CRYPTO_INFO *headerCryptoInfo, CRYPTO_IN
 	uint32 headerCrc32;
 	byte *fieldPos;
 	PCRYPTO_INFO pCryptoInfo = headerCryptoInfo;
+#ifdef _WIN64
+	BOOL bIsRamEncryptionEnabled = IsRamEncryptionEnabled();
+#endif
 
 	header = (byte *) TCalloc (TC_VOLUME_HEADER_EFFECTIVE_SIZE);
 
@@ -1812,7 +1864,7 @@ int FastVolumeHeaderUpdate (HANDLE dev, CRYPTO_INFO *headerCryptoInfo, CRYPTO_IN
 
 	offset.QuadPart = deviceSize - TC_VOLUME_HEADER_GROUP_SIZE;
 
-	if (SetFilePointerEx (dev, offset, NULL, FILE_BEGIN) == 0
+	if (MoveFilePointer (dev, offset) == 0
 		|| !ReadEffectiveVolumeHeader (TRUE, dev, header, &n) || n < TC_VOLUME_HEADER_EFFECTIVE_SIZE)
 	{
 		nStatus = ERR_OS_ERROR;
@@ -1820,7 +1872,7 @@ int FastVolumeHeaderUpdate (HANDLE dev, CRYPTO_INFO *headerCryptoInfo, CRYPTO_IN
 	}
 
 #ifdef _WIN64
-	if (IsRamEncryptionEnabled())
+	if (bIsRamEncryptionEnabled)
 	{
 		pCryptoInfo = crypto_open();
 		if (!pCryptoInfo)
@@ -1861,7 +1913,7 @@ int FastVolumeHeaderUpdate (HANDLE dev, CRYPTO_INFO *headerCryptoInfo, CRYPTO_IN
 	EncryptBuffer (header + HEADER_ENCRYPTED_DATA_OFFSET, HEADER_ENCRYPTED_DATA_SIZE, pCryptoInfo);
 
 
-	if (SetFilePointerEx (dev, offset, NULL, FILE_BEGIN) == 0
+	if (MoveFilePointer (dev, offset) == 0
 		|| !WriteEffectiveVolumeHeader (TRUE, dev, header))
 	{
 		nStatus = ERR_OS_ERROR;
@@ -1874,7 +1926,7 @@ closing_seq:
 	dwError = GetLastError();
 
 #ifdef _WIN64
-	if (IsRamEncryptionEnabled() && pCryptoInfo)
+	if (bIsRamEncryptionEnabled && pCryptoInfo)
 	{
 		crypto_close(pCryptoInfo);
 	}
@@ -2040,7 +2092,7 @@ static int ConcealNTFS (HANDLE dev)
 
 	offset.QuadPart = 0;
 
-	if (SetFilePointerEx (dev, offset, NULL, FILE_BEGIN) == 0)
+	if (MoveFilePointer (dev, offset) == 0)
 		return ERR_OS_ERROR;
 
 	if (ReadFile (dev, buf, TC_INITIAL_NTFS_CONCEAL_PORTION_SIZE, &nbrBytesProcessed, NULL) == 0)
@@ -2051,7 +2103,7 @@ static int ConcealNTFS (HANDLE dev)
 
 	offset.QuadPart = 0;
 
-	if (SetFilePointerEx (dev, offset, NULL, FILE_BEGIN) == 0)
+	if (MoveFilePointer (dev, offset) == 0)
 		return ERR_OS_ERROR;
 
 	if (WriteFile (dev, buf, TC_INITIAL_NTFS_CONCEAL_PORTION_SIZE, &nbrBytesProcessed, NULL) == 0)
@@ -2070,7 +2122,7 @@ static int ConcealNTFS (HANDLE dev)
 		{
 			Sleep (1);
 		}
-		while (SetFilePointerEx (dev, offset, NULL, FILE_BEGIN) == 0
+		while (MoveFilePointer (dev, offset) == 0
 			|| WriteFile (dev, buf, TC_INITIAL_NTFS_CONCEAL_PORTION_SIZE, &nbrBytesProcessed2, NULL) == 0);
 
 		SetLastError (dwError);
@@ -2146,6 +2198,38 @@ BOOL SaveNonSysInPlaceEncSettings (int delta, WipeAlgorithmId newWipeAlgorithm,
 	return SaveBufferToFile (str, GetConfigPath (TC_APPD_FILENAME_NONSYS_INPLACE_ENC), (DWORD) strlen(str), FALSE, FALSE);
 }
 
+// This function moves the file pointer to the given offset. It first retrieves the current
+// file position using SetFilePointerEx() with FILE_CURRENT as the reference point, and then
+// calculates the difference between the current position and the desired position. Subsequently,
+// it moves the file pointer by the difference calculated using SetFilePointerEx() again.
+//
+// This approach of moving the file pointer relatively (instead of absolutely) was implemented 
+// as a workaround to address the performance issues related to in-place encryption. When using
+// SetFilePointerEx() with FILE_BEGIN as the reference point, reaching the end of large drives 
+// during in-place encryption can cause significant slowdowns. By moving the file pointer
+// relatively, these performance issues are mitigated.
+//
+// We fall back to absolute positioning if the relative positioning fails.
+BOOL MoveFilePointer (HANDLE dev, LARGE_INTEGER offset)
+{
+	LARGE_INTEGER currOffset;
+	LARGE_INTEGER diffOffset;
+
+	currOffset.QuadPart = 0;
+	if (SetFilePointerEx (dev, currOffset, &currOffset, FILE_CURRENT))
+	{
+		diffOffset.QuadPart = offset.QuadPart - currOffset.QuadPart;
+		if (diffOffset.QuadPart == 0)
+			return TRUE;
+
+		// Moves the file pointer by the difference between current and desired positions
+		if (SetFilePointerEx (dev, diffOffset, NULL, FILE_CURRENT))
+			return TRUE;
+	}
+
+	// An error occurred, fallback to absolute positioning
+	return SetFilePointerEx (dev, offset, NULL, FILE_BEGIN);
+}
 
 // Repairs damaged sectors (i.e. those with read errors) by zeroing them.
 // Note that this operating fails if there are any write errors.
@@ -2165,7 +2249,7 @@ int ZeroUnreadableSectors (HANDLE dev, LARGE_INTEGER startOffset, int64 size, in
 	if (!sectorBuffer)
 		return ERR_OUTOFMEMORY;
 
-	if (SetFilePointerEx (dev, startOffset, NULL, FILE_BEGIN) == 0)
+	if (!MoveFilePointer(dev, workOffset))
 	{
 		nStatus = ERR_OS_ERROR;
 		goto closing_seq;
@@ -2178,7 +2262,8 @@ int ZeroUnreadableSectors (HANDLE dev, LARGE_INTEGER startOffset, int64 size, in
 		{
 			memset (sectorBuffer, 0, sectorSize);
 
-			if (SetFilePointerEx (dev, workOffset, NULL, FILE_BEGIN) == 0)
+            // If ReadFile failed, move back to start of the unreadable sector
+            if (MoveFilePointer (dev, workOffset) == 0)
 			{
 				nStatus = ERR_OS_ERROR;
 				goto closing_seq;
@@ -2229,7 +2314,7 @@ static int OpenBackupHeader (HANDLE dev, const wchar_t *devicePath, Password *pa
 
 	offset.QuadPart = deviceSize - TC_VOLUME_HEADER_GROUP_SIZE;
 
-	if (SetFilePointerEx (dev, offset, NULL, FILE_BEGIN) == 0
+	if (MoveFilePointer (dev, offset) == 0
 		|| !ReadEffectiveVolumeHeader (TRUE, dev, (byte *) header, &n) || n < TC_VOLUME_HEADER_EFFECTIVE_SIZE)
 	{
 		nStatus = ERR_OS_ERROR;
@@ -2237,7 +2322,7 @@ static int OpenBackupHeader (HANDLE dev, const wchar_t *devicePath, Password *pa
 	}
 
 
-	nStatus = ReadVolumeHeader (FALSE, header, password, pkcs5, pim, FALSE, retMasterCryptoInfo, headerCryptoInfo);
+	nStatus = ReadVolumeHeader (FALSE, header, password, pkcs5, pim, retMasterCryptoInfo, headerCryptoInfo);
 	if (nStatus != ERR_SUCCESS)
 		goto closing_seq;