mirrors
/
VeraCrypt
mirror of https://github.com/veracrypt/VeraCrypt.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Windows: Add checks on IOCTL_DISK_GET_DRIVE_LAYOUT_EX response to make Coverity happy.

This commit is contained in:
Mounir IDRASSI 2017-06-11 14:38:30 +02:00
parent 1662abb707
commit 70d083bfb2
No known key found for this signature in database
GPG Key ID: DD0C382D5FCFB8FC
1 changed files with 51 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
src/Common/Dlgcode.c
View File

@ -11995,62 +11995,66 @@ void UpdateMountableHostDeviceList ()
(LPVOID) buffer.data(), (LPVOID) buffer.data(),
(DWORD) buffer.size(), (DWORD) buffer.size(),
(LPDWORD) &bytesReturned, (LPDWORD) &bytesReturned,
NULL)) NULL) && (bytesReturned >= sizeof (DRIVE_LAYOUT_INFORMATION_EX)))
{ {
PDRIVE_LAYOUT_INFORMATION_EX layout = (PDRIVE_LAYOUT_INFORMATION_EX) buffer.data(); PDRIVE_LAYOUT_INFORMATION_EX layout = (PDRIVE_LAYOUT_INFORMATION_EX) buffer.data();
for (DWORD i = 0; i < layout->PartitionCount; i++) // sanity checks
if (layout->PartitionCount <= 256)
{ {
if (layout->PartitionEntry[i].PartitionStyle == PARTITION_STYLE_MBR) for (DWORD i = 0; i < layout->PartitionCount; i++)
{ {
if (layout->PartitionEntry[i].Mbr.PartitionType == 0) if (layout->PartitionEntry[i].PartitionStyle == PARTITION_STYLE_MBR)
continue;
bHasPartition = true;
/* skip dynamic volume */
if (layout->PartitionEntry[i].Mbr.PartitionType == PARTITION_LDM)
{ {
bIsDynamic = true; if (layout->PartitionEntry[i].Mbr.PartitionType == 0)
/* remove any partition that may have been added */ continue;
while (!mountableDevices.empty() && (mountableDevices.back().SystemNumber == It->SystemNumber))
mountableDevices.pop_back (); bHasPartition = true;
break;
/* skip dynamic volume */
if (layout->PartitionEntry[i].Mbr.PartitionType == PARTITION_LDM)
{
bIsDynamic = true;
/* remove any partition that may have been added */
while (!mountableDevices.empty() && (mountableDevices.back().SystemNumber == It->SystemNumber))
mountableDevices.pop_back ();
break;
}
} }
}
if (layout->PartitionEntry[i].PartitionStyle == PARTITION_STYLE_GPT) if (layout->PartitionEntry[i].PartitionStyle == PARTITION_STYLE_GPT)
{
if (IsEqualGUID(layout->PartitionEntry[i].Gpt.PartitionType, PARTITION_ENTRY_UNUSED_GUID))
continue;
bHasPartition = true;
/* skip dynamic volume */
if ( IsEqualGUID(layout->PartitionEntry[i].Gpt.PartitionType, PARTITION_LDM_METADATA_GUID)
|| IsEqualGUID(layout->PartitionEntry[i].Gpt.PartitionType, PARTITION_LDM_DATA_GUID)
)
{ {
bIsDynamic = true; if (IsEqualGUID(layout->PartitionEntry[i].Gpt.PartitionType, PARTITION_ENTRY_UNUSED_GUID))
/* remove any partition that may have been added */ continue;
while (!mountableDevices.empty() && (mountableDevices.back().SystemNumber == It->SystemNumber))
mountableDevices.pop_back ();
break;
}
}
WCHAR path[MAX_PATH]; bHasPartition = true;
StringCbPrintfW (path, sizeof(path), L"\\\\?\\GLOBALROOT\\Device\\Harddisk%d\\Partition%d", It->SystemNumber, layout->PartitionEntry[i].PartitionNumber);
HANDLE handle = CreateFile( path, /* skip dynamic volume */
0, if ( IsEqualGUID(layout->PartitionEntry[i].Gpt.PartitionType, PARTITION_LDM_METADATA_GUID)
FILE_SHARE_READ | FILE_SHARE_WRITE, || IsEqualGUID(layout->PartitionEntry[i].Gpt.PartitionType, PARTITION_LDM_DATA_GUID)
NULL, )
OPEN_EXISTING, {
0, bIsDynamic = true;
NULL ); /* remove any partition that may have been added */
if (handle != INVALID_HANDLE_VALUE) while (!mountableDevices.empty() && (mountableDevices.back().SystemNumber == It->SystemNumber))
{ mountableDevices.pop_back ();
AddDeviceToList (mountableDevices, It->SystemNumber, layout->PartitionEntry[i].PartitionNumber); break;
CloseHandle (handle); }
}
WCHAR path[MAX_PATH];
StringCbPrintfW (path, sizeof(path), L"\\\\?\\GLOBALROOT\\Device\\Harddisk%d\\Partition%d", It->SystemNumber, layout->PartitionEntry[i].PartitionNumber);
HANDLE handle = CreateFile( path,
0,
FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL,
OPEN_EXISTING,
0,
NULL );
if (handle != INVALID_HANDLE_VALUE)
{
AddDeviceToList (mountableDevices, It->SystemNumber, layout->PartitionEntry[i].PartitionNumber);
CloseHandle (handle);
}
} }
} }
} }