diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c b/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c index 9229a8cbe7..342e186191 100644 --- a/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c +++ b/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c @@ -100,7 +100,7 @@ PartitionInstallElToritoChildHandles ( Status = DiskIo->ReadDisk ( DiskIo, Media->MediaId, - VolDescriptorLba, + MultU64x32 (VolDescriptorLba, Media->BlockSize), Media->BlockSize, VolDescriptor ); @@ -143,7 +143,7 @@ PartitionInstallElToritoChildHandles ( Status = DiskIo->ReadDisk ( DiskIo, Media->MediaId, - Lba, + MultU64x32 (Lba, Media->BlockSize), Media->BlockSize, Catalog ); diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c index 3f352cc318..a54bd48ba9 100644 --- a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c +++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c @@ -296,12 +296,12 @@ PartitionInstallGptChildHandles ( } Status = DiskIo->ReadDisk ( - DiskIo, - BlockIo->Media->MediaId, - MultU64x32(PrimaryHeader->PartitionEntryLBA, BlockSize), - PrimaryHeader->NumberOfPartitionEntries * (PrimaryHeader->SizeOfPartitionEntry), - PartEntry - ); + DiskIo, + BlockIo->Media->MediaId, + MultU64x32(PrimaryHeader->PartitionEntryLBA, BlockSize), + PrimaryHeader->NumberOfPartitionEntries * (PrimaryHeader->SizeOfPartitionEntry), + PartEntry + ); if (EFI_ERROR (Status)) { GptValidStatus = Status; DEBUG ((EFI_D_ERROR, " Partition Entry ReadDisk error\n")); @@ -436,7 +436,7 @@ PartitionValidGptTable ( Status = DiskIo->ReadDisk ( DiskIo, BlockIo->Media->MediaId, - Lba, + MultU64x32 (Lba, BlockSize), BlockSize, PartHdr ); diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c index cfa43f4fe9..393f538428 100644 --- a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c +++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c @@ -242,7 +242,7 @@ PartitionInstallMbrChildHandles ( Status = DiskIo->ReadDisk ( DiskIo, BlockIo->Media->MediaId, - ExtMbrStartingLba, + MultU64x32 (ExtMbrStartingLba, BlockIo->Media->BlockSize), BlockIo->Media->BlockSize, Mbr );