kamkow1/Limine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drivers/disk: Ensure disk_volume_from_efi_handle() does not return erroneous results

Browse Source
This commit is contained in:
mintsuki
2024-07-14 04:32:40 +02:00
parent f5241cbc5c
commit b258face1c
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/drivers/disk.s2.c
View File

@@ -410,6 +410,8 @@ struct volume *disk_volume_from_efi_handle(EFI_HANDLE efi_handle) {
block_io->Media->WriteCaching = false;
struct volume *candidate = NULL;
size_t candidate_index = (size_t)-1;
for (size_t i = 0; i < volume_index_i; i++) {
if (volume_index[i]->unique_sector_valid == false) {
continue;
@@ -421,6 +423,10 @@ struct volume *disk_volume_from_efi_handle(EFI_HANDLE efi_handle) {
size_t unique_sector = volume_index[i]->unique_sector / block_io->Media->BlockSize;
if (candidate != NULL && unique_sector <= candidate_index) {
continue;
}
status = block_io->ReadBlocks(block_io, block_io->Media->MediaId,
unique_sector,
4096,
@@ -433,10 +439,17 @@ struct volume *disk_volume_from_efi_handle(EFI_HANDLE efi_handle) {
blake2b(b2b, unique_sector_pool, 4096);
if (memcmp(b2b, volume_index[i]->unique_sector_b2b, BLAKE2B_OUT_BYTES) == 0) {
return volume_index[i];
if (candidate == NULL || unique_sector > candidate_index) {
candidate = volume_index[i];
candidate_index = unique_sector;
}
}
}
if (candidate != NULL) {
return candidate;
}
// Fallback to read-back method
uint64_t signature = rand64();