ArmPkg/CpuDxe/ArmV6: Return error status when ExceptionHandlersStart is not 32-byte...

[mirror_edk2.git] / ArmPkg / Drivers / CpuDxe / ArmV6 / Exception.c

diff --git a/ArmPkg/Drivers/CpuDxe/ArmV6/Exception.c b/ArmPkg/Drivers/CpuDxe/ArmV6/Exception.c
index 55a71321935007376be89a792b6899a3a0ea8347..80006261260a1206b40b049a71c39cf184e892fa 100644 (file)
--- a/ArmPkg/Drivers/CpuDxe/ArmV6/Exception.c
+++ b/ArmPkg/Drivers/CpuDxe/ArmV6/Exception.c
@@ -1,6 +1,7 @@
 /** @file\r
 \r
   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
+  Copyright (c) 2014, ARM Limited. All rights reserved.<BR>\r
   \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -207,9 +208,12 @@ InitializeExceptions (
     //Note: On ARM processor with the Security Extension, the Vector Table can be located anywhere in the memory.\r
     //      The Vector Base Address Register defines the location\r
     ArmWriteVBar (PcdGet32(PcdCpuVectorBaseAddress));\r
-  } else {\r
+  } else {
     // The Vector table must be 32-byte aligned\r
-    ASSERT(((UINT32)ExceptionHandlersStart & ((1 << 5)-1)) == 0);\r
+    if (((UINT32)ExceptionHandlersStart & ARM_VECTOR_TABLE_ALIGNMENT) != 0) {\r
+      ASSERT (0);\r
+      return EFI_INVALID_PARAMETER;\r
+    }\r
 \r
     // We do not copy the Exception Table at PcdGet32(PcdCpuVectorBaseAddress). We just set Vector Base Address to point into CpuDxe code.\r
     ArmWriteVBar ((UINT32)ExceptionHandlersStart);\r