mirrors/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2026-05-14 00:21:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Windows: fix favorite volume mount race

Browse Source 
Copy selected favorite volumes into mount thread parameters so background mounting does not depend on mutable global vector storage. Also avoid unnecessary FavoriteVolume copies in auto-mount paths and fix mount-on-arrival state updates.

Refs #1661
This commit is contained in:
Mounir IDRASSI
2026-04-18 14:59:26 +09:00
parent da2198831f
commit e6adb96b15
3 changed files with 88 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Mount/Favorites.cpp
View File

@@ -290,7 +290,7 @@ namespace VeraCrypt
{
bMountFavoritesOnLogon = FALSE;
foreach (const FavoriteVolume &favorite, Favorites)
for (const FavoriteVolume& favorite: Favorites)
{
if (favorite.MountOnLogOn)
{
@@ -301,7 +301,7 @@ namespace VeraCrypt
if (!bEnableBkgTask || bCloseBkgTaskWhenNoVolumes || IsNonInstallMode())
{
foreach (const FavoriteVolume favorite, Favorites)
for (const FavoriteVolume& favorite: Favorites)
{
if (favorite.MountOnArrival)
{
@@ -482,7 +482,7 @@ namespace VeraCrypt
AppendMenu (FavoriteVolumesMenu, MF_SEPARATOR, 0, L"");
int i = 0;
foreach (const FavoriteVolume &favorite, FavoriteVolumes)
for (const FavoriteVolume& favorite: FavoriteVolumes)
{
UINT flags = MF_STRING;
@@ -512,7 +512,7 @@ namespace VeraCrypt
SendMessage (favoriteListControl, LVM_DELETEALLITEMS, 0, 0);
int line = 0;
foreach (const FavoriteVolume favorite, favorites)
for (const FavoriteVolume& favorite: favorites)
{
ListItemAdd (favoriteListControl, line, (wchar_t *) favorite.MountPoint.substr (0, 2).c_str());
FillListControlSubItems (favoriteListControl, line++, favorite);
@@ -533,7 +533,7 @@ namespace VeraCrypt
wstring GetFavoriteVolumeLabel (const wstring &volumePath, bool& useInExplorer)
{
foreach (const FavoriteVolume &favorite, FavoriteVolumes)
for (const FavoriteVolume& favorite: FavoriteVolumes)
{
if (favorite.Path == volumePath)
{
@@ -542,7 +542,7 @@ namespace VeraCrypt
}
}
foreach (const FavoriteVolume &favorite, SystemFavoriteVolumes)
for (const FavoriteVolume& favorite: SystemFavoriteVolumes)
{
if (favorite.Path == volumePath)
{
@@ -735,7 +735,7 @@ namespace VeraCrypt
FavoritesOnArrivalMountRequired.clear();
for (const FavoriteVolume favorite: FavoriteVolumes)
for (const FavoriteVolume& favorite: FavoriteVolumes)
{
if (favorite.MountOnArrival)
{
@@ -745,7 +745,7 @@ namespace VeraCrypt
{
bool present = false;
for (const FavoriteVolume favoriteConnected: FavoritesMountedOnArrivalStillConnected)
for (const FavoriteVolume& favoriteConnected: FavoritesMountedOnArrivalStillConnected)
{
if (favorite.Path == favoriteConnected.Path)
{
@@ -795,7 +795,7 @@ namespace VeraCrypt
XmlWriteHeader (f);
fputws (L"\n\t<favorites>", f);
foreach (const FavoriteVolume &favorite, favorites)
for (const FavoriteVolume& favorite: favorites)
{
wchar_t tq[2048];

111
src/Mount/Mount.c
View File

@@ -189,6 +189,43 @@ static DWORD LastKnownLogicalDrives;
static volatile LONG FavoriteMountOnGoing = 0;
static mountFavoriteVolumeThreadParam* AllocateMountFavoriteVolumeThreadParam (BOOL systemFavorites, BOOL logOnMount, BOOL hotKeyMount, const FavoriteVolume* favoriteVolumeToMount)
{
mountFavoriteVolumeThreadParam* pParam = (mountFavoriteVolumeThreadParam*) calloc (1, sizeof (mountFavoriteVolumeThreadParam));
if (!pParam)
return NULL;
pParam->systemFavorites = systemFavorites;
pParam->logOnMount = logOnMount;
pParam->hotKeyMount = hotKeyMount;
if (favoriteVolumeToMount)
{
try
{
pParam->favoriteVolumeToMount = new FavoriteVolume (*favoriteVolumeToMount);
}
catch (...)
{
free (pParam);
return NULL;
}
}
return pParam;
}
static void FreeMountFavoriteVolumeThreadParam (mountFavoriteVolumeThreadParam* pParam)
{
if (pParam)
{
delete pParam->favoriteVolumeToMount;
free (pParam);
}
}
const wchar_t* MainInitMutexName = L"Local\\VeraCryptMainInit_02B831C5_401D_4A0D_8CC5_98D2C4CEB5F2";
static HANDLE MainInitMutex = NULL; /* Mutex for main dialog WM_INITDIALOG */
static BOOL MainInitMutexAcquired = FALSE; /* TRUE if the main window mutex has been acquired */
@@ -5847,7 +5884,7 @@ static BOOL MountAllDevicesThreadCode (HWND hwndDlg, BOOL bPasswordPrompt)
if (devices.empty())
devices = GetAvailableHostDevices (true, false, true, true);
foreach (const HostDevice &drive, devices)
for (const HostDevice& drive: devices)
{
vector <HostDevice> partitions = drive.Partitions;
partitions.insert (partitions.begin(), drive);
@@ -7852,8 +7889,9 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
break;
reentry = true;
finally_do_arg (bool*, &reentry, { *finally_arg = false; });
for (FavoriteVolume favorite: FavoritesOnArrivalMountRequired)
for (FavoriteVolume& favorite: FavoritesOnArrivalMountRequired)
{
if (favorite.UseVolumeID)
{
@@ -7903,7 +7941,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
continue;
bool mountedAndNotDisconnected = false;
for (FavoriteVolume mountedFavorite: FavoritesMountedOnArrivalStillConnected)
for (const FavoriteVolume& mountedFavorite: FavoritesMountedOnArrivalStillConnected)
{
if (favorite.Path == mountedFavorite.Path)
{
@@ -7914,39 +7952,46 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
if (!mountedAndNotDisconnected)
{
FavoriteMountOnArrivalInProgress = TRUE;
MountFavoriteVolumes (hwndDlg, FALSE, FALSE, FALSE, favorite);
FavoriteMountOnArrivalInProgress = FALSE;
BOOL mounted = FALSE;
{
FavoriteMountOnArrivalInProgress = TRUE;
finally_do ({ FavoriteMountOnArrivalInProgress = FALSE; });
mounted = MountFavoriteVolumes (hwndDlg, FALSE, FALSE, FALSE, favorite);
}
FavoritesMountedOnArrivalStillConnected.push_back (favorite);
if (mounted)
FavoritesMountedOnArrivalStillConnected.push_back (favorite);
}
}
bool deleted;
for (list <FavoriteVolume>::iterator favorite = FavoritesMountedOnArrivalStillConnected.begin();
favorite != FavoritesMountedOnArrivalStillConnected.end();
deleted ? favorite : ++favorite)
favorite != FavoritesMountedOnArrivalStillConnected.end();)
{
deleted = false;
if (IsMountedVolume (favorite->Path.c_str()))
{
++favorite;
continue;
}
if (!IsVolumeDeviceHosted (favorite->Path.c_str()))
{
if (FileExists (favorite->Path.c_str()))
{
++favorite;
continue;
}
}
wchar_t volDevPath[TC_MAX_PATH];
if (favorite->VolumePathId.size() > 5
&& QueryDosDevice (favorite->VolumePathId.substr (4, favorite->VolumePathId.size() - 5).c_str(), volDevPath, TC_MAX_PATH) != 0)
{
++favorite;
continue;
}
// set DisconnectedDevice field on FavoritesOnArrivalMountRequired element
foreach (FavoriteVolume onArrivalFavorite, FavoritesOnArrivalMountRequired)
for (FavoriteVolume& onArrivalFavorite: FavoritesOnArrivalMountRequired)
{
if (onArrivalFavorite.Path == favorite->Path)
{
@@ -7956,10 +8001,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
}
favorite = FavoritesMountedOnArrivalStillConnected.erase (favorite);
deleted = true;
}
reentry = false;
}
}
@@ -9109,7 +9151,10 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
if (lw == IDM_MOUNT_FAVORITE_VOLUMES)
{
if (0 == _InterlockedCompareExchange(&FavoriteMountOnGoing, 1, 0))
_beginthread(mountFavoriteVolumeThreadFunction, 0, NULL);
{
if (_beginthread(mountFavoriteVolumeThreadFunction, 0, NULL) == (uintptr_t) -1L)
_InterlockedExchange(&FavoriteMountOnGoing, 0);
}
return 1;
}
@@ -9192,13 +9237,13 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
{
if (0 == _InterlockedCompareExchange(&FavoriteMountOnGoing, 1, 0))
{
mountFavoriteVolumeThreadParam* pParam = (mountFavoriteVolumeThreadParam*) calloc(1, sizeof(mountFavoriteVolumeThreadParam));
pParam->systemFavorites = FALSE;
pParam->logOnMount = FALSE;
pParam->hotKeyMount = FALSE;
pParam->favoriteVolumeToMount = &FavoriteVolumes[favoriteIndex];
mountFavoriteVolumeThreadParam* pParam = AllocateMountFavoriteVolumeThreadParam (FALSE, FALSE, FALSE, &FavoriteVolumes[favoriteIndex]);
_beginthread(mountFavoriteVolumeThreadFunction, 0, pParam);
if (!pParam || _beginthread(mountFavoriteVolumeThreadFunction, 0, pParam) == (uintptr_t) -1L)
{
FreeMountFavoriteVolumeThreadParam (pParam);
_InterlockedExchange(&FavoriteMountOnGoing, 0);
}
}
}
}
@@ -10854,7 +10899,7 @@ BOOL MountFavoriteVolumes (HWND hwnd, BOOL systemFavorites, BOOL logOnMount, BOO
else
favorites = FavoriteVolumes;
foreach (const FavoriteVolume &favorite, favorites)
for (const FavoriteVolume& favorite: favorites)
{
if (ServiceMode && systemFavorites && favorite.DisconnectedDevice)
{
@@ -10955,12 +11000,12 @@ void CALLBACK mountFavoriteVolumeCallbackFunction (void *pArg, HWND hwnd)
if (pParam)
{
finally_do_arg (mountFavoriteVolumeThreadParam*, pParam, { FreeMountFavoriteVolumeThreadParam (finally_arg); });
if (pParam->favoriteVolumeToMount)
MountFavoriteVolumes (hwnd, pParam->systemFavorites, pParam->logOnMount, pParam->hotKeyMount, *(pParam->favoriteVolumeToMount));
else
MountFavoriteVolumes (hwnd, pParam->systemFavorites, pParam->logOnMount, pParam->hotKeyMount);
free (pParam);
}
else
MountFavoriteVolumes (hwnd);
@@ -10969,8 +11014,8 @@ void CALLBACK mountFavoriteVolumeCallbackFunction (void *pArg, HWND hwnd)
void __cdecl mountFavoriteVolumeThreadFunction (void *pArg)
{
ScreenCaptureBlocker screenCaptureBlocker;
finally_do ({ _InterlockedExchange(&FavoriteMountOnGoing, 0); });
ShowWaitDialog (MainDlg, FALSE, mountFavoriteVolumeCallbackFunction, pArg);
_InterlockedExchange(&FavoriteMountOnGoing, 0);
}
static void SaveDefaultKeyFilesParam (HWND hwnd)
@@ -11107,13 +11152,13 @@ static void HandleHotKey (HWND hwndDlg, WPARAM wParam)
{
if (0 == _InterlockedCompareExchange(&FavoriteMountOnGoing, 1, 0))
{
mountFavoriteVolumeThreadParam* pParam = (mountFavoriteVolumeThreadParam*) calloc(1, sizeof(mountFavoriteVolumeThreadParam));
pParam->systemFavorites = FALSE;
pParam->logOnMount = FALSE;
pParam->hotKeyMount = TRUE;
pParam->favoriteVolumeToMount = NULL;
mountFavoriteVolumeThreadParam* pParam = AllocateMountFavoriteVolumeThreadParam (FALSE, FALSE, TRUE, NULL);
_beginthread(mountFavoriteVolumeThreadFunction, 0, pParam);
if (!pParam || _beginthread(mountFavoriteVolumeThreadFunction, 0, pParam) == (uintptr_t) -1L)
{
FreeMountFavoriteVolumeThreadParam (pParam);
_InterlockedExchange(&FavoriteMountOnGoing, 0);
}
}
}
break;

1
src/Mount/Mount.h
View File

@@ -121,6 +121,7 @@ typedef struct
BOOL systemFavorites;
BOOL logOnMount;
BOOL hotKeyMount;
/* Owned by the thread parameter when non-NULL. */
VeraCrypt::FavoriteVolume* favoriteVolumeToMount;
} mountFavoriteVolumeThreadParam;