Public/VeraCrypt
1
0 Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2026-10-06 00:56:35 -05:00
Code Activity

macOS: preserve FUSE service identity in fallback metadata

Browse Source 
Generate the session serial before forking and reuse it in the service
and fallback mount metadata.

This keeps PR #1866's shutdown identity check consistent when control
metadata cannot be read.
This commit is contained in:
Mounir IDRASSI committed 2026-09-26 03:38:01 +02:00
1 parent dbfd67d4c1
commit 23d4452f5b
3 files changed
+24 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Core/Unix/CoreUnix.cpp
+9 -3
View File
@@ -1169,9 +1169,17 @@ namespace VeraCrypt
} }
} }
#ifdef VC_MACOSX_FUSET
uint64 fuseServiceSerialInstanceNumber;
#endif
try try
{ {
#ifdef VC_MACOSX_FUSET
fuseServiceSerialInstanceNumber = FuseService::Mount (volume, options.SlotNumber, fuseMountPoint);
#else
FuseService::Mount (volume, options.SlotNumber, fuseMountPoint); FuseService::Mount (volume, options.SlotNumber, fuseMountPoint);
#endif
} }
catch (...) catch (...)
{ {
@@ -1295,9 +1303,7 @@ namespace VeraCrypt
mountedVolume->AuxMountPoint = fuseMountPoint; mountedVolume->AuxMountPoint = fuseMountPoint;
mountedVolume->VirtualDevice = mountedVirtualDevice; mountedVolume->VirtualDevice = mountedVirtualDevice;
struct timeval tv; mountedVolume->SerialInstanceNumber = fuseServiceSerialInstanceNumber;
gettimeofday (&tv, NULL);
mountedVolume->SerialInstanceNumber = (uint64) tv.tv_sec * 1000000ULL + tv.tv_usec;
if (!options.NoFilesystem) if (!options.NoFilesystem)
{ {
src/Driver/Fuse/FuseService.cpp
+11 -5
View File
@@ -790,7 +790,7 @@ namespace VeraCrypt
return MountedVolume->GetSize(); return MountedVolume->GetSize();
} }
void FuseService::Mount (shared_ptr <Volume> openVolume, VolumeSlotNumber slotNumber, const string &fuseMountPoint) uint64 FuseService::Mount (shared_ptr <Volume> openVolume, VolumeSlotNumber slotNumber, const string &fuseMountPoint)
{ {
list <string> args; list <string> args;
args.push_back (FuseService::GetDeviceType()); args.push_back (FuseService::GetDeviceType());
@@ -826,7 +826,13 @@ namespace VeraCrypt
args.push_back ("use_ino"); args.push_back ("use_ino");
#endif #endif
ExecFunctor execFunctor (openVolume, slotNumber); // Generate the serial before forking so the caller can reuse it if
// the service's control metadata cannot be read.
struct timeval tv;
throw_sys_if (gettimeofday (&tv, NULL) != 0);
const uint64 serialInstanceNumber = (uint64)tv.tv_sec * 1000000ULL + tv.tv_usec;
ExecFunctor execFunctor (openVolume, slotNumber, serialInstanceNumber);
Process::Execute ("fuse", args, -1, &execFunctor); Process::Execute ("fuse", args, -1, &execFunctor);
for (int t = 0; true; t++) for (int t = 0; true; t++)
@@ -846,6 +852,8 @@ namespace VeraCrypt
Thread::Sleep (100); Thread::Sleep (100);
} }
return serialInstanceNumber;
} }
void FuseService::ReadVolumeSectors (const BufferPtr &buffer, uint64 byteOffset) void FuseService::ReadVolumeSectors (const BufferPtr &buffer, uint64 byteOffset)
@@ -964,9 +972,7 @@ namespace VeraCrypt
void FuseService::ExecFunctor::operator() (int argc, char *argv[]) void FuseService::ExecFunctor::operator() (int argc, char *argv[])
{ {
struct timeval tv; FuseService::OpenVolumeInfo.SerialInstanceNumber = SerialInstanceNumber;
gettimeofday (&tv, NULL);
FuseService::OpenVolumeInfo.SerialInstanceNumber = (uint64)tv.tv_sec * 1000000ULL + tv.tv_usec;
FuseService::MountedVolume = MountedVolume; FuseService::MountedVolume = MountedVolume;
FuseService::SlotNumber = SlotNumber; FuseService::SlotNumber = SlotNumber;
src/Driver/Fuse/FuseService.h
+4 -3
View File
@@ -27,8 +27,8 @@ namespace VeraCrypt
protected: protected:
struct ExecFunctor : public ProcessExecFunctor struct ExecFunctor : public ProcessExecFunctor
{ {
ExecFunctor (shared_ptr <Volume> openVolume, VolumeSlotNumber slotNumber) ExecFunctor (shared_ptr <Volume> openVolume, VolumeSlotNumber slotNumber, uint64 serialInstanceNumber)
: MountedVolume (openVolume), SlotNumber (slotNumber) : MountedVolume (openVolume), SlotNumber (slotNumber), SerialInstanceNumber (serialInstanceNumber)
{ {
} }
virtual void operator() (int argc, char *argv[]); virtual void operator() (int argc, char *argv[]);
@@ -36,6 +36,7 @@ namespace VeraCrypt
protected: protected:
shared_ptr <Volume> MountedVolume; shared_ptr <Volume> MountedVolume;
VolumeSlotNumber SlotNumber; VolumeSlotNumber SlotNumber;
uint64 SerialInstanceNumber;
}; };
friend struct ExecFunctor; friend struct ExecFunctor;
@@ -60,7 +61,7 @@ namespace VeraCrypt
static shared_ptr <Buffer> GetVolumeInfo (); static shared_ptr <Buffer> GetVolumeInfo ();
static uint64 GetVolumeSize (); static uint64 GetVolumeSize ();
static uint64 GetVolumeSectorSize () { return MountedVolume->GetSectorSize(); } static uint64 GetVolumeSectorSize () { return MountedVolume->GetSectorSize(); }
static void Mount (shared_ptr <Volume> openVolume, VolumeSlotNumber slotNumber, const string &fuseMountPoint); static uint64 Mount (shared_ptr <Volume> openVolume, VolumeSlotNumber slotNumber, const string &fuseMountPoint);
static void ReadVolumeSectors (const BufferPtr &buffer, uint64 byteOffset); static void ReadVolumeSectors (const BufferPtr &buffer, uint64 byteOffset);
static void ReceiveAuxDeviceInfo (const ConstBufferPtr &buffer); static void ReceiveAuxDeviceInfo (const ConstBufferPtr &buffer);
static void SendAuxDeviceInfo (const DirectoryPath &fuseMountPoint, const DevicePath &virtualDevice, const DevicePath &loopDevice = DevicePath()); static void SendAuxDeviceInfo (const DirectoryPath &fuseMountPoint, const DevicePath &virtualDevice, const DevicePath &loopDevice = DevicePath());