MdeModulePkg RamDiskDxe: Fix incorrect RAM disk memory address calculation

EndingAddress is calculated incorrectly. Original code calculates it as
(StartingAddress + Size). Correct value should be (StartingAddress +
Size - 1.

Note:
Besides the changes made by Samer, Hao also fixed a similar issue in
RamDiskImpl.c

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Samer El-Haj-Mahmoud <elhaj@hpe.com>
Signed-off-by: Tapan Shah <tapandshah@hpe.com>
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Tapan Shah <tapandshah@hpe.com>

diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.c b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.c
index 9df9b5b9654216b6f64eab6bb712c1ecebd9bff0..29dcbf72f76901cf5be394fec68e2e4371e88a02 100644 (file)
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.c
+++ b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.c
@@ -566,7 +566,7 @@ UpdateMainForm (
       L"  RAM Disk %d: [0x%lx, 0x%lx]\n",\r
       Index,\r
       PrivateData->StartingAddr,\r
-      PrivateData->StartingAddr + PrivateData->Size\r
+      PrivateData->StartingAddr + PrivateData->Size - 1\r
       );\r
 \r
     StringId = HiiSetString (ConfigPrivate->HiiHandle, 0, RamDiskStr, NULL);\r

diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskProtocol.c b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskProtocol.c
index 0c1df9dc73395e6e6240e617d69cb52529183e6d..de117212329a9a68ee2583a8fa6739ffebc3c7f7 100644 (file)
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskProtocol.c
+++ b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskProtocol.c
@@ -2,6 +2,7 @@
   The realization of EFI_RAM_DISK_PROTOCOL.\r
 \r
   Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -50,7 +51,7 @@ RamDiskInitDeviceNode (
     );\r
   WriteUnaligned64 (\r
     (UINT64 *) &(RamDiskDevNode->EndingAddr[0]),\r
-    (UINT64) PrivateData->StartingAddr + PrivateData->Size\r
+    (UINT64) PrivateData->StartingAddr + PrivateData->Size - 1\r
     );\r
   CopyGuid (&RamDiskDevNode->TypeGuid, &PrivateData->TypeGuid);\r
   RamDiskDevNode->Instance = PrivateData->InstanceNumber;\r
@@ -305,7 +306,7 @@ RamDiskUnregister (
       // and type guid.\r
       //\r
       if ((StartingAddr == PrivateData->StartingAddr) &&\r
-          (EndingAddr == PrivateData->StartingAddr + PrivateData->Size) &&\r
+          (EndingAddr == PrivateData->StartingAddr + PrivateData->Size - 1) &&\r
           (CompareGuid (&RamDiskDevNode->TypeGuid, &PrivateData->TypeGuid))) {\r
         //\r
         // Uninstall the EFI_DEVICE_PATH_PROTOCOL & EFI_BLOCK_IO(2)_PROTOCOL\r