Public/VeraCrypt
1
0 Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2026-10-05 16:46: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/Driver/Fuse/FuseService.h
+4 -3
View File
@@ -27,8 +27,8 @@ namespace VeraCrypt
protected:
struct ExecFunctor : public ProcessExecFunctor
{
ExecFunctor (shared_ptr <Volume> openVolume, VolumeSlotNumber slotNumber)
: MountedVolume (openVolume), SlotNumber (slotNumber)
ExecFunctor (shared_ptr <Volume> openVolume, VolumeSlotNumber slotNumber, uint64 serialInstanceNumber)
: MountedVolume (openVolume), SlotNumber (slotNumber), SerialInstanceNumber (serialInstanceNumber)
{
}
virtual void operator() (int argc, char *argv[]);
@@ -36,6 +36,7 @@ namespace VeraCrypt
protected:
shared_ptr <Volume> MountedVolume;
VolumeSlotNumber SlotNumber;
uint64 SerialInstanceNumber;
};
friend struct ExecFunctor;
@@ -60,7 +61,7 @@ namespace VeraCrypt
static shared_ptr <Buffer> GetVolumeInfo ();
static uint64 GetVolumeSize ();
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 ReceiveAuxDeviceInfo (const ConstBufferPtr &buffer);
static void SendAuxDeviceInfo (const DirectoryPath &fuseMountPoint, const DevicePath &virtualDevice, const DevicePath &loopDevice = DevicePath());