X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FFaultTolerantWriteDxe%2FFtwMisc.c;h=b3352bbe070d03510200ae69bf0f96cf89fceb65;hp=fdd9dfa0c17a30f5c146dac3516ee49361323250;hb=2c4b18e09590e50c95b95fd485144d00b3b7f39f;hpb=0dda774c86bf00462fc167686d5f8497abb633bb

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c
index fdd9dfa0c1..b3352bbe07 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c
@@ -1111,6 +1111,20 @@ FindFvbForFtw (
               ASSERT (FALSE);
               return EFI_ABORTED;
             }
+            //
+            // Check the alignment of spare area address and length, they should be block size aligned
+            //
+            if (((FtwDevice->SpareAreaAddress & (FtwDevice->BlockSize - 1)) != 0) ||
+                ((FtwDevice->SpareAreaLength & (FtwDevice->BlockSize - 1)) != 0)) {
+              DEBUG ((EFI_D_ERROR, "Ftw: Spare area address or length is not block size aligned\n"));
+              FreePool (HandleBuffer);
+              //
+              // Report Status Code EFI_SW_EC_ABORTED.
+              //
+              REPORT_STATUS_CODE (  (EFI_ERROR_CODE | EFI_ERROR_UNRECOVERED), (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_EC_ABORTED));
+              ASSERT (FALSE);
+              CpuDeadLoop ();
+            }
             break;
           }
         }
@@ -1118,12 +1132,12 @@ FindFvbForFtw (
     }
   }
   FreePool (HandleBuffer);
- 
+
   if ((FtwDevice->FtwBackupFvb == NULL) || (FtwDevice->FtwFvBlock == NULL) ||
     (FtwDevice->FtwWorkSpaceLba == (EFI_LBA) (-1)) || (FtwDevice->FtwSpareLba == (EFI_LBA) (-1))) {
     return EFI_ABORTED;
   }
-    
+
   return EFI_SUCCESS;
 }