Ensure the validity of Ffs Sections when adding a new Sections to Ffs.

[mirror_edk2.git] / MdePkg / Library / PeiMemoryAllocationLib / MemoryAllocationLib.c

diff --git a/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c b/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c
index 63641569ffe65d2450d59ee6c6e25ae8994faee9..b4f84cb4d2b2a0c7706673e8c794e4eca64490ff 100644 (file)
--- a/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c
+++ b/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c
@@ -15,17 +15,18 @@
 **/\r
 \r
 \r
 **/\r
 \r
 \r

-\r

 /**\r
 /**\r

-  Allocates the number of 4KB pages specified by Pages of a certain memory type.\r
-\r
-  @param  MemoryType The type of memory to allocate.\r
-  @param  Pages The number of 4 KB pages to allocate.\r
+  Allocates one or more 4KB pages of a certain memory type.\r

 \r
 \r

-  @return A pointer to the allocated buffer.  The buffer returned is aligned on a 4KB boundary.\r
-  If Pages is 0, then NULL is returned.\r
+  Allocates the number of 4KB pages of a certain memory type and returns a pointer to the allocated\r
+  buffer.  The buffer returned is aligned on a 4KB boundary.  If Pages is 0, then NULL is returned.\r

   If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
 \r
   If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
 \r

+  @param  MemoryType            The type of memory to allocate.\r
+  @param  Pages                 The number of 4 KB pages to allocate.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r
+\r

 **/\r
 VOID *\r
 InternalAllocatePages (\r
 **/\r
 VOID *\r
 InternalAllocatePages (\r


@@ -50,13 +51,16 @@ InternalAllocatePages (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Allocates the number of 4KB pages specified by Pages of type EfiBootServicesData.\r
+  Allocates one or more 4KB pages of type EfiBootServicesData.\r

 \r
 \r

-  @param  Pages The number of 4 KB pages to allocate.\r
+  Allocates the number of 4KB pages of type EfiBootServicesData and returns a pointer to the\r
+  allocated buffer.  The buffer returned is aligned on a 4KB boundary.  If Pages is 0, then NULL\r
+  is returned.  If there is not enough memory remaining to satisfy the request, then NULL is\r
+  returned.\r

 \r
 \r

-  @return A pointer to the allocated buffer.  The buffer returned is aligned on a 4KB boundary.\r
-  If Pages is 0, then NULL is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  Pages                 The number of 4 KB pages to allocate.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -69,13 +73,16 @@ AllocatePages (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Allocates the number of 4KB pages specified by Pages of type EfiRuntimeServicesData. \r
+  Allocates one or more 4KB pages of type EfiRuntimeServicesData.\r

 \r
 \r

-  @param  Pages The number of 4 KB pages to allocate.\r
+  Allocates the number of 4KB pages of type EfiRuntimeServicesData and returns a pointer to the\r
+  allocated buffer.  The buffer returned is aligned on a 4KB boundary.  If Pages is 0, then NULL\r
+  is returned.  If there is not enough memory remaining to satisfy the request, then NULL is\r
+  returned.\r

 \r
 \r

-  @return A pointer to the allocated buffer.  The buffer returned is aligned on a 4KB boundary.\r
-  If Pages is 0, then NULL is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  Pages                 The number of 4 KB pages to allocate.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -88,13 +95,16 @@ AllocateRuntimePages (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Allocates the number of 4KB pages specified by Pages of type EfiReservedMemoryType. \r
+  Allocates one or more 4KB pages of type EfiReservedMemoryType.\r

 \r
 \r

-  @param  Pages The number of 4 KB pages to allocate.\r
+  Allocates the number of 4KB pages of type EfiReservedMemoryType and returns a pointer to the\r
+  allocated buffer.  The buffer returned is aligned on a 4KB boundary.  If Pages is 0, then NULL\r
+  is returned.  If there is not enough memory remaining to satisfy the request, then NULL is\r
+  returned.\r

 \r
 \r

-  @return A pointer to the allocated buffer.  The buffer returned is aligned on a 4KB boundary.\r
-  If Pages is 0, then NULL is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  Pages                 The number of 4 KB pages to allocate.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -107,11 +117,18 @@ AllocateReservedPages (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Frees one or more 4KB pages that were previously allocated with \r
-  one of the page allocation functions in the Memory Allocation Library.\r
-\r
-  @param  Buffer Pointer to the buffer of pages to free.\r
-  @param  Pages The number of 4 KB pages to free.\r
+  Frees one or more 4KB pages that were previously allocated with one of the page allocation\r
+  functions in the Memory Allocation Library.\r
+\r
+  Frees the number of 4KB pages specified by Pages from the buffer specified by Buffer.  Buffer\r
+  must have been allocated on a previous call to the page allocation services of the Memory\r
+  Allocation Library.\r
+  If Buffer was not allocated with a page allocation function in the Memory Allocation Library,\r
+  then ASSERT().\r
+  If Pages is zero, then ASSERT().\r
+ \r
+  @param  Buffer                Pointer to the buffer of pages to free.\r
+  @param  Pages                 The number of 4 KB pages to free.\r

 \r
 **/\r
 VOID\r
 \r
 **/\r
 VOID\r


@@ -127,16 +144,20 @@ FreePages (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Allocates the number of 4KB pages specified by Pages of a certian memory type \r
-  with an alignment specified by Alignment. \r
+  Allocates one or more 4KB pages of a certain memory type at a specified alignment.\r

 \r
 \r

-  @param  MemoryType The type of memory to allocate.\r
-  @param  Pages The number of 4 KB pages to allocate.\r
-  @param  Alignment The requested alignment of the allocation.  Must be a power of two.\r
-  If Alignment is zero, then byte alignment is used.\r
+  Allocates the number of 4KB pages specified by Pages of a certain memory type with an alignment\r
+  specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is returned.\r
+  If there is not enough memory at the specified alignment remaining to satisfy the request, then\r
+  NULL is returned.\r
+  If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r

 \r
 \r

-  @return The allocated buffer is returned.  If Pages is 0, then NULL is returned.\r
-  If there is not enough memory at the specified alignment remaining to satisfy the request, then NULL is returned.\r
+  @param  MemoryType            The type of memory to allocate.\r
+  @param  Pages                 The number of 4 KB pages to allocate.\r
+  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.\r
+                                If Alignment is zero, then byte alignment is used.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -158,6 +179,10 @@ InternalAllocateAlignedPages (
     return NULL;\r
   }\r
   //\r
     return NULL;\r
   }\r
   //\r

+  // Make sure that Pages plus EFI_SIZE_TO_PAGES (Alignment) does not overflow.\r
+  //\r
+  ASSERT (Pages <= (MAX_ADDRESS - EFI_SIZE_TO_PAGES (Alignment)));\r
+  //\r

   // We would rather waste some memory to save PEI code size.\r
   //\r
   Memory = InternalAllocatePages (MemoryType, Pages + EFI_SIZE_TO_PAGES (Alignment));\r
   // We would rather waste some memory to save PEI code size.\r
   //\r
   Memory = InternalAllocatePages (MemoryType, Pages + EFI_SIZE_TO_PAGES (Alignment));\r


@@ -170,15 +195,19 @@ InternalAllocateAlignedPages (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Allocates the number of 4KB pages specified by Pages of type EfiBootServicesData\r
-  with an alignment specified by Alignment.   \r
+  Allocates one or more 4KB pages of type EfiBootServicesData at a specified alignment.\r

 \r
 \r

-  @param  Pages The number of 4 KB pages to allocate.\r
-  @param  Alignment The requested alignment of the allocation.  Must be a power of two.\r
-  If Alignment is zero, then byte alignment is used.\r
+  Allocates the number of 4KB pages specified by Pages of type EfiBootServicesData with an\r
+  alignment specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is\r
+  returned.  If there is not enough memory at the specified alignment remaining to satisfy the\r
+  request, then NULL is returned.\r
+  If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r

 \r
 \r

-  @return The allocated buffer is returned.  If Pages is 0, then NULL is returned.\r
-  If there is not enough memory at the specified alignment remaining to satisfy the request, then NULL is returned.\r
+  @param  Pages                 The number of 4 KB pages to allocate.\r
+  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.\r
+                                If Alignment is zero, then byte alignment is used.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -192,15 +221,19 @@ AllocateAlignedPages (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Allocates the number of 4KB pages specified by Pages of type EfiRuntimeServicesData\r
-  with an alignment specified by Alignment.   \r
+  Allocates one or more 4KB pages of type EfiRuntimeServicesData at a specified alignment.\r
+\r
+  Allocates the number of 4KB pages specified by Pages of type EfiRuntimeServicesData with an\r
+  alignment specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is\r
+  returned.  If there is not enough memory at the specified alignment remaining to satisfy the\r
+  request, then NULL is returned.\r
+  If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r

 \r
 \r

-  @param  Pages The number of 4 KB pages to allocate.\r
-  @param  Alignment The requested alignment of the allocation.  Must be a power of two.\r
-  If Alignment is zero, then byte alignment is used.\r
+  @param  Pages                 The number of 4 KB pages to allocate.\r
+  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.\r
+                                If Alignment is zero, then byte alignment is used.\r

 \r
 \r

-  @return The allocated buffer is returned.  If Pages is 0, then NULL is returned.\r
-  If there is not enough memory at the specified alignment remaining to satisfy the request, then NULL is returned.\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -216,12 +249,17 @@ AllocateAlignedRuntimePages (
 /**\r
   Allocates one or more 4KB pages of type EfiReservedMemoryType at a specified alignment.\r
 \r
 /**\r
   Allocates one or more 4KB pages of type EfiReservedMemoryType at a specified alignment.\r
 \r

-  @param  Pages The number of 4 KB pages to allocate.\r
-  @param  Alignment The requested alignment of the allocation.  Must be a power of two.\r
-  If Alignment is zero, then byte alignment is used.\r
+  Allocates the number of 4KB pages specified by Pages of type EfiReservedMemoryType with an\r
+  alignment specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is\r
+  returned.  If there is not enough memory at the specified alignment remaining to satisfy the\r
+  request, then NULL is returned.\r
+  If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r

 \r
 \r

-  @return The allocated buffer is returned.  If Pages is 0, then NULL is returned.\r
-  If there is not enough memory at the specified alignment remaining to satisfy the request, then NULL is returned.\r
+  @param  Pages                 The number of 4 KB pages to allocate.\r
+  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.\r
+                                If Alignment is zero, then byte alignment is used.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -235,11 +273,18 @@ AllocateAlignedReservedPages (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Frees one or more 4KB pages that were previously allocated with \r
-  one of the aligned page allocation functions in the Memory Allocation Library.\r
-\r
-  @param  Buffer Pointer to the buffer of pages to free.\r
-  @param  Pages The number of 4 KB pages to free.\r
+  Frees one or more 4KB pages that were previously allocated with one of the aligned page\r
+  allocation functions in the Memory Allocation Library.\r
+\r
+  Frees the number of 4KB pages specified by Pages from the buffer specified by Buffer.  Buffer\r
+  must have been allocated on a previous call to the aligned page allocation services of the Memory\r
+  Allocation Library.\r
+  If Buffer was not allocated with an aligned page allocation function in the Memory Allocation\r
+  Library, then ASSERT().\r
+  If Pages is zero, then ASSERT().\r
+  \r
+  @param  Buffer                Pointer to the buffer of pages to free.\r
+  @param  Pages                 The number of 4 KB pages to free.\r

 \r
 **/\r
 VOID\r
 \r
 **/\r
 VOID\r


@@ -255,13 +300,16 @@ FreeAlignedPages (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Allocates a buffer of a certain memory type.\r
+  Allocates a buffer of a certain pool type.\r

 \r
 \r

-  @param  MemoryType The type of memory to allocate.\r
-  @param  AllocationSize The number of bytes to allocate.\r
+  Allocates the number bytes specified by AllocationSize of a certain pool type and returns a\r
+  pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is\r
+  returned.  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r

 \r
 \r

-  @return A pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  MemoryType            The type of memory to allocate.\r
+  @param  AllocationSize        The number of bytes to allocate.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -281,10 +329,13 @@ InternalAllocatePool (
 /**\r
   Allocates a buffer of type EfiBootServicesData.\r
 \r
 /**\r
   Allocates a buffer of type EfiBootServicesData.\r
 \r

-  @param  AllocationSize The number of bytes to allocate.\r
+  Allocates the number bytes specified by AllocationSize of type EfiBootServicesData and returns a\r
+  pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is\r
+  returned.  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r

 \r
 \r

-  @return A pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  AllocationSize        The number of bytes to allocate.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -309,10 +360,13 @@ AllocatePool (
 /**\r
   Allocates a buffer of type EfiRuntimeServicesData.\r
 \r
 /**\r
   Allocates a buffer of type EfiRuntimeServicesData.\r
 \r

-  @param  AllocationSize The number of bytes to allocate.\r
+  Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData and returns\r
+  a pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is\r
+  returned.  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r

 \r
 \r

-  @return A pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  AllocationSize        The number of bytes to allocate.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -325,12 +379,15 @@ AllocateRuntimePool (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Allocates a buffer of type EfiReservedMemoryType.\r
+  Allocates a buffer of type EfieservedMemoryType.\r

 \r
 \r

-  @param  AllocationSize The number of bytes to allocate.\r
+  Allocates the number bytes specified by AllocationSize of type EfieservedMemoryType and returns\r
+  a pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is\r
+  returned.  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r

 \r
 \r

-  @return A pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  AllocationSize        The number of bytes to allocate.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -345,11 +402,15 @@ AllocateReservedPool (
 /**\r
   Allocates and zeros a buffer of a certian pool type.\r
 \r
 /**\r
   Allocates and zeros a buffer of a certian pool type.\r
 \r

-  @param  PoolType The type of memory to allocate.\r
-  @param  AllocationSize The number of bytes to allocate and zero.\r
+  Allocates the number bytes specified by AllocationSize of a certian pool type, clears the buffer\r
+  with zeros, and returns a pointer to the allocated buffer.  If AllocationSize is 0, then a valid\r
+  buffer of 0 size is returned.  If there is not enough memory remaining to satisfy the request,\r
+  then NULL is returned.\r

 \r
 \r

-  @return A pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  PoolType              The type of memory to allocate.\r
+  @param  AllocationSize        The number of bytes to allocate and zero.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -370,10 +431,14 @@ InternalAllocateZeroPool (
 /**\r
   Allocates and zeros a buffer of type EfiBootServicesData.\r
 \r
 /**\r
   Allocates and zeros a buffer of type EfiBootServicesData.\r
 \r

-  @param  AllocationSize The number of bytes to allocate and zero.\r
+  Allocates the number bytes specified by AllocationSize of type EfiBootServicesData, clears the\r
+  buffer with zeros, and returns a pointer to the allocated buffer.  If AllocationSize is 0, then a\r
+  valid buffer of 0 size is returned.  If there is not enough memory remaining to satisfy the\r
+  request, then NULL is returned.\r

 \r
 \r

-  @return A pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  AllocationSize        The number of bytes to allocate and zero.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -394,10 +459,14 @@ AllocateZeroPool (
 /**\r
   Allocates and zeros a buffer of type EfiRuntimeServicesData.\r
 \r
 /**\r
   Allocates and zeros a buffer of type EfiRuntimeServicesData.\r
 \r

-  @param  AllocationSize The number of bytes to allocate and zero.\r
+  Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData, clears the\r
+  buffer with zeros, and returns a pointer to the allocated buffer.  If AllocationSize is 0, then a\r
+  valid buffer of 0 size is returned.  If there is not enough memory remaining to satisfy the\r
+  request, then NULL is returned.\r

 \r
 \r

-  @return A pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  AllocationSize        The number of bytes to allocate and zero.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -412,10 +481,14 @@ AllocateRuntimeZeroPool (
 /**\r
   Allocates and zeros a buffer of type EfiReservedMemoryType.\r
 \r
 /**\r
   Allocates and zeros a buffer of type EfiReservedMemoryType.\r
 \r

-  @param  AllocationSize The number of bytes to allocate and zero.\r
+  Allocates the number bytes specified by AllocationSize of type EfiReservedMemoryType, clears the\r
+  buffer with zeros, and returns a pointer to the allocated buffer.  If AllocationSize is 0, then a\r
+  valid buffer of 0 size is returned.  If there is not enough memory remaining to satisfy the\r
+  request, then NULL is returned.\r

 \r
 \r

-  @return A pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  AllocationSize        The number of bytes to allocate and zero.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -428,14 +501,20 @@ AllocateReservedZeroPool (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Copies a buffer to an allocated buffer of a certian memory type. \r
+  Copies a buffer to an allocated buffer of a certian pool type.\r

 \r
 \r

-  @param  MemoryType The type of pool to allocate.\r
-  @param  AllocationSize The number of bytes to allocate and zero.\r
-  @param  Buffer The buffer to copy to the allocated buffer.\r
+  Allocates the number bytes specified by AllocationSize of a certian pool type, copies\r
+  AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the\r
+  allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
+  is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  If Buffer is NULL, then ASSERT().\r
+  If AllocationSize is greater than (MAX_ADDRESS \96 Buffer + 1), then ASSERT(). \r

 \r
 \r

-  @return A pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  PoolType              The type of pool to allocate.\r
+  @param  AllocationSize        The number of bytes to allocate and zero.\r
+  @param  Buffer                The buffer to copy to the allocated buffer.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -447,6 +526,9 @@ InternalAllocateCopyPool (
 {\r
   VOID  *Memory;\r
 \r
 {\r
   VOID  *Memory;\r
 \r

+  ASSERT (Buffer != NULL);\r
+  ASSERT (AllocationSize <= (MAX_ADDRESS - (UINTN) Buffer + 1));\r
+\r

   Memory = InternalAllocatePool (PoolType, AllocationSize);\r
   if (Memory != NULL) {\r
      Memory = CopyMem (Memory, Buffer, AllocationSize);\r
   Memory = InternalAllocatePool (PoolType, AllocationSize);\r
   if (Memory != NULL) {\r
      Memory = CopyMem (Memory, Buffer, AllocationSize);\r


@@ -455,13 +537,19 @@ InternalAllocateCopyPool (
 } \r
 \r
 /**\r
 } \r
 \r
 /**\r

-  Copies a buffer to an allocated buffer of type EfiBootServicesData. \r
+  Copies a buffer to an allocated buffer of type EfiBootServicesData.\r

 \r
 \r

-  @param  AllocationSize The number of bytes to allocate.\r
-  @param  Buffer The buffer to copy to the allocated buffer.\r
+  Allocates the number bytes specified by AllocationSize of type EfiBootServicesData, copies\r
+  AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the\r
+  allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
+  is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  If Buffer is NULL, then ASSERT().\r
+  If AllocationSize is greater than (MAX_ADDRESS \96 Buffer + 1), then ASSERT(). \r

 \r
 \r

-  @return A pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  AllocationSize        The number of bytes to allocate and zero.\r
+  @param  Buffer                The buffer to copy to the allocated buffer.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -473,6 +561,9 @@ AllocateCopyPool (
 {\r
   VOID  *Memory;\r
 \r
 {\r
   VOID  *Memory;\r
 \r

+  ASSERT (Buffer != NULL);\r
+  ASSERT (AllocationSize <= (MAX_ADDRESS - (UINTN) Buffer + 1));\r
+\r

   Memory = AllocatePool (AllocationSize);\r
   if (Memory != NULL) {\r
      Memory = CopyMem (Memory, Buffer, AllocationSize);\r
   Memory = AllocatePool (AllocationSize);\r
   if (Memory != NULL) {\r
      Memory = CopyMem (Memory, Buffer, AllocationSize);\r


@@ -481,13 +572,19 @@ AllocateCopyPool (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Copies a buffer to an allocated buffer of type EfiRuntimeServicesData. \r
+  Copies a buffer to an allocated buffer of type EfiRuntimeServicesData.\r

 \r
 \r

-  @param  AllocationSize The number of bytes to allocate.\r
-  @param  Buffer The buffer to copy to the allocated buffer.\r
+  Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData, copies\r
+  AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the\r
+  allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
+  is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  If Buffer is NULL, then ASSERT().\r
+  If AllocationSize is greater than (MAX_ADDRESS \96 Buffer + 1), then ASSERT(). \r

 \r
 \r

-  @return A pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  AllocationSize        The number of bytes to allocate and zero.\r
+  @param  Buffer                The buffer to copy to the allocated buffer.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -501,13 +598,19 @@ AllocateRuntimeCopyPool (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Copies a buffer to an allocated buffer of type EfiReservedMemoryType. \r
+  Copies a buffer to an allocated buffer of type EfiReservedMemoryType.\r

 \r
 \r

-  @param  AllocationSize The number of bytes to allocate.\r
-  @param  Buffer The buffer to copy to the allocated buffer.\r
+  Allocates the number bytes specified by AllocationSize of type EfiReservedMemoryType, copies\r
+  AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the\r
+  allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
+  is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  If Buffer is NULL, then ASSERT().\r
+  If AllocationSize is greater than (MAX_ADDRESS \96 Buffer + 1), then ASSERT(). \r

 \r
 \r

-  @return A pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  AllocationSize        The number of bytes to allocate and zero.\r
+  @param  Buffer                The buffer to copy to the allocated buffer.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -521,9 +624,15 @@ AllocateReservedCopyPool (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Copies a buffer to an allocated buffer of type EfiReservedMemoryType at a specified alignment.\r
+  Frees a buffer that was previously allocated with one of the pool allocation functions in the\r
+  Memory Allocation Library.\r

 \r
 \r

-  @param  Buffer Pointer to the buffer to free.\r
+  Frees the buffer specified by Buffer.  Buffer must have been allocated on a previous call to the\r
+  pool allocation services of the Memory Allocation Library.\r
+  If Buffer was not allocated with a pool allocation function in the Memory Allocation Library,\r
+  then ASSERT().\r
+\r
+  @param  Buffer                Pointer to the buffer to free.\r

 \r
 **/\r
 VOID\r
 \r
 **/\r
 VOID\r


@@ -540,12 +649,18 @@ FreePool (
 /**\r
   Allocates a buffer of a certain pool type at a specified alignment.\r
 \r
 /**\r
   Allocates a buffer of a certain pool type at a specified alignment.\r
 \r

-  @param  PoolType The type of pool to allocate.\r
-  @param  AllocationSize The number of bytes to allocate.\r
-  @param  Alignment The requested alignment of the allocation.  Must be a power of two.                            If Alignment is zero, then byte alignment is used.\r
+  Allocates the number bytes specified by AllocationSize of a certain pool type with an alignment\r
+  specified by Alignment.  The allocated buffer is returned.  If AllocationSize is 0, then a valid\r
+  buffer of 0 size is returned.  If there is not enough memory at the specified alignment remaining\r
+  to satisfy the request, then NULL is returned.\r
+  If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r

 \r
 \r

-  @return A pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  PoolType              The type of pool to allocate.\r
+  @param  AllocationSize        The number of bytes to allocate.\r
+  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.                            If Alignment is zero, then byte alignment is used.\r
+                                If Alignment is zero, then byte alignment is used.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -569,6 +684,10 @@ InternalAllocateAlignedPool (
   } else {\r
     AlignmentMask = Alignment - 1;\r
   }\r
   } else {\r
     AlignmentMask = Alignment - 1;\r
   }\r

+  //\r
+  // Make sure that AllocationSize plus AlignmentMask does not overflow.\r
+  //\r
+  ASSERT (AllocationSize <= (MAX_ADDRESS - AlignmentMask));\r

 \r
   RawAddress      = InternalAllocatePool (PoolType, AllocationSize + AlignmentMask);\r
   \r
 \r
   RawAddress      = InternalAllocatePool (PoolType, AllocationSize + AlignmentMask);\r
   \r


@@ -580,11 +699,17 @@ InternalAllocateAlignedPool (
 /**\r
   Allocates a buffer of type EfiBootServicesData at a specified alignment.\r
 \r
 /**\r
   Allocates a buffer of type EfiBootServicesData at a specified alignment.\r
 \r

-  @param  AllocationSize The number of bytes to allocate.\r
-  @param  Alignment The requested alignment of the allocation.  Must be a power of two.                            If Alignment is zero, then byte alignment is used.\r
+  Allocates the number bytes specified by AllocationSize of type EfiBootServicesData with an\r
+  alignment specified by Alignment.  The allocated buffer is returned.  If AllocationSize is 0,\r
+  then a valid buffer of 0 size is returned.  If there is not enough memory at the specified\r
+  alignment remaining to satisfy the request, then NULL is returned.\r
+  If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r

 \r
 \r

-  @return A pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  AllocationSize        The number of bytes to allocate.\r
+  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.\r
+                                If Alignment is zero, then byte alignment is used.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -609,6 +734,11 @@ AllocateAlignedPool (
     AlignmentMask = Alignment - 1;\r
   }\r
 \r
     AlignmentMask = Alignment - 1;\r
   }\r
 \r

+  //\r
+  // Make sure that AllocationSize plus AlignmentMask does not overflow.\r
+  //\r
+  ASSERT (AllocationSize <= (MAX_ADDRESS - AlignmentMask));\r
+\r

   RawAddress      = AllocatePool (AllocationSize + AlignmentMask);\r
   \r
   AlignedAddress  = ((UINTN) RawAddress + AlignmentMask) & ~AlignmentMask;\r
   RawAddress      = AllocatePool (AllocationSize + AlignmentMask);\r
   \r
   AlignedAddress  = ((UINTN) RawAddress + AlignmentMask) & ~AlignmentMask;\r


@@ -619,12 +749,17 @@ AllocateAlignedPool (
 /**\r
   Allocates a buffer of type EfiRuntimeServicesData at a specified alignment.\r
 \r
 /**\r
   Allocates a buffer of type EfiRuntimeServicesData at a specified alignment.\r
 \r

-  @param  AllocationSize The number of bytes to allocate.\r
-  @param  Alignment The requested alignment of the allocation.  Must be a power of two.\r
-  If Alignment is zero, then byte alignment is used.\r
+  Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData with an\r
+  alignment specified by Alignment.  The allocated buffer is returned.  If AllocationSize is 0,\r
+  then a valid buffer of 0 size is returned.  If there is not enough memory at the specified\r
+  alignment remaining to satisfy the request, then NULL is returned.\r
+  If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r

 \r
 \r

-  @return A pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  AllocationSize        The number of bytes to allocate.\r
+  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.\r
+                                If Alignment is zero, then byte alignment is used.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -638,14 +773,19 @@ AllocateAlignedRuntimePool (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Allocates a buffer of type EfiReservedMemoryType at a specified alignment.\r
+  Allocates a buffer of type EfieservedMemoryType at a specified alignment.\r

 \r
 \r

-  @param  AllocationSize The number of bytes to allocate.\r
-  @param  Alignment The requested alignment of the allocation.  Must be a power of two.\r
-  If Alignment is zero, then byte alignment is used.\r
+  Allocates the number bytes specified by AllocationSize of type EfieservedMemoryType with an\r
+  alignment specified by Alignment.  The allocated buffer is returned.  If AllocationSize is 0,\r
+  then a valid buffer of 0 size is returned.  If there is not enough memory at the specified\r
+  alignment remaining to satisfy the request, then NULL is returned.\r
+  If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r

 \r
 \r

-  @return A pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  AllocationSize        The number of bytes to allocate.\r
+  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.\r
+                                If Alignment is zero, then byte alignment is used.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -659,15 +799,20 @@ AllocateAlignedReservedPool (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Allocates and zeros a buffer of type EfiBootServicesData at a specified alignment.\r
+  Allocates and zeros a buffer of a certain pool type at a specified alignment.\r

 \r
 \r

-  @param  PoolType The type of pool to allocate.\r
-  @param  AllocationSize The number of bytes to allocate.\r
-  @param  Alignment The requested alignment of the allocation.  Must be a power of two.\r
-  If Alignment is zero, then byte alignment is used.\r
+  Allocates the number bytes specified by AllocationSize of a certain pool type with an alignment\r
+  specified by Alignment, clears the buffer with zeros, and returns a pointer to the allocated\r
+  buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there is not\r
+  enough memory at the specified alignment remaining to satisfy the request, then NULL is returned.\r
+  If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r

 \r
 \r

-  @return A pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  PoolType              The type of pool to allocate.\r
+  @param  AllocationSize        The number of bytes to allocate.\r
+  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.\r
+                                If Alignment is zero, then byte alignment is used.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -689,12 +834,18 @@ InternalAllocateAlignedZeroPool (
 /**\r
   Allocates and zeros a buffer of type EfiBootServicesData at a specified alignment.\r
 \r
 /**\r
   Allocates and zeros a buffer of type EfiBootServicesData at a specified alignment.\r
 \r

-  @param  AllocationSize The number of bytes to allocate.\r
-  @param  Alignment The requested alignment of the allocation.  Must be a power of two.\r
-  If Alignment is zero, then byte alignment is used.\r
+  Allocates the number bytes specified by AllocationSize of type EfiBootServicesData with an\r
+  alignment specified by Alignment, clears the buffer with zeros, and returns a pointer to the\r
+  allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
+  is not enough memory at the specified alignment remaining to satisfy the request, then NULL is\r
+  returned.\r
+  If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r

 \r
 \r

-  @return A pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  AllocationSize        The number of bytes to allocate.\r
+  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.\r
+                                If Alignment is zero, then byte alignment is used.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -716,12 +867,18 @@ AllocateAlignedZeroPool (
 /**\r
   Allocates and zeros a buffer of type EfiRuntimeServicesData at a specified alignment.\r
 \r
 /**\r
   Allocates and zeros a buffer of type EfiRuntimeServicesData at a specified alignment.\r
 \r

-  @param  AllocationSize The number of bytes to allocate.\r
-  @param  Alignment The requested alignment of the allocation.  Must be a power of two.\r
-  If Alignment is zero, then byte alignment is used.\r
+  Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData with an\r
+  alignment specified by Alignment, clears the buffer with zeros, and returns a pointer to the\r
+  allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
+  is not enough memory at the specified alignment remaining to satisfy the request, then NULL is\r
+  returned.\r
+  If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r

 \r
 \r

-  @return A pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  AllocationSize        The number of bytes to allocate.\r
+  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.\r
+                                If Alignment is zero, then byte alignment is used.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -735,14 +892,20 @@ AllocateAlignedRuntimeZeroPool (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Allocates and zeros a buffer of type EfiReservedMemoryType at a specified alignment.\r
+  Allocates and zeros a buffer of type EfieservedMemoryType at a specified alignment.\r

 \r
 \r

-  @param  AllocationSize The number of bytes to allocate.\r
-  @param  Alignment The requested alignment of the allocation.  Must be a power of two.\r
-  If Alignment is zero, then byte alignment is used.\r
+  Allocates the number bytes specified by AllocationSize of type EfieservedMemoryType with an\r
+  alignment specified by Alignment, clears the buffer with zeros, and returns a pointer to the\r
+  allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
+  is not enough memory at the specified alignment remaining to satisfy the request, then NULL is\r
+  returned.\r
+  If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r

 \r
 \r

-  @return A pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  AllocationSize        The number of bytes to allocate.\r
+  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.\r
+                                If Alignment is zero, then byte alignment is used.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -756,16 +919,21 @@ AllocateAlignedReservedZeroPool (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Copies a buffer to an allocated buffer of type EfiBootServicesData at a specified alignment.\r
+  Copies a buffer to an allocated buffer of a certain pool type at a specified alignment.\r

 \r
 \r

-  @param  PoolType The type of pool to allocate.\r
-  @param  AllocationSize The number of bytes to allocate.\r
-  @param  Buffer The buffer to copy to the allocated buffer.\r
-  @param  Alignment The requested alignment of the allocation.  Must be a power of two.\r
-  If Alignment is zero, then byte alignment is used.\r
+  Allocates the number bytes specified by AllocationSize of a certain pool type with an alignment\r
+  specified by Alignment.  The allocated buffer is returned.  If AllocationSize is 0, then a valid\r
+  buffer of 0 size is returned.  If there is not enough memory at the specified alignment remaining\r
+  to satisfy the request, then NULL is returned.\r
+  If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r

 \r
 \r

-  @return A pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  PoolType              The type of pool to allocate.\r
+  @param  AllocationSize        The number of bytes to allocate.\r
+  @param  Buffer                The buffer to copy to the allocated buffer.\r
+  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.\r
+                                If Alignment is zero, then byte alignment is used.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -778,6 +946,9 @@ InternalAllocateAlignedCopyPool (
 {\r
   VOID  *Memory;\r
   \r
 {\r
   VOID  *Memory;\r
   \r

+  ASSERT (Buffer != NULL);\r
+  ASSERT (AllocationSize <= (MAX_ADDRESS - (UINTN) Buffer + 1));\r
+\r

   Memory = InternalAllocateAlignedPool (PoolType, AllocationSize, Alignment);\r
   if (Memory != NULL) {\r
     Memory = CopyMem (Memory, Buffer, AllocationSize);\r
   Memory = InternalAllocateAlignedPool (PoolType, AllocationSize, Alignment);\r
   if (Memory != NULL) {\r
     Memory = CopyMem (Memory, Buffer, AllocationSize);\r


@@ -788,13 +959,18 @@ InternalAllocateAlignedCopyPool (
 /**\r
   Copies a buffer to an allocated buffer of type EfiBootServicesData at a specified alignment.\r
 \r
 /**\r
   Copies a buffer to an allocated buffer of type EfiBootServicesData at a specified alignment.\r
 \r

-  @param  AllocationSize The number of bytes to allocate.\r
-  @param  Buffer The buffer to copy to the allocated buffer.\r
-  @param  Alignment The requested alignment of the allocation.  Must be a power of two.\r
-  If Alignment is zero, then byte alignment is used.\r
+  Allocates the number bytes specified by AllocationSize of type EfiBootServicesData type with an\r
+  alignment specified by Alignment.  The allocated buffer is returned.  If AllocationSize is 0,\r
+  then a valid buffer of 0 size is returned.  If there is not enough memory at the specified\r
+  alignment remaining to satisfy the request, then NULL is returned.\r
+  If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r

 \r
 \r

-  @return A pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  AllocationSize        The number of bytes to allocate.\r
+  @param  Buffer                The buffer to copy to the allocated buffer.\r
+  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.\r
+                                If Alignment is zero, then byte alignment is used.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -807,6 +983,9 @@ AllocateAlignedCopyPool (
 {\r
   VOID  *Memory;\r
   \r
 {\r
   VOID  *Memory;\r
   \r

+  ASSERT (Buffer != NULL);\r
+  ASSERT (AllocationSize <= (MAX_ADDRESS - (UINTN) Buffer + 1));\r
+\r

   Memory = AllocateAlignedPool (AllocationSize, Alignment);\r
   if (Memory != NULL) {\r
     Memory = CopyMem (Memory, Buffer, AllocationSize);\r
   Memory = AllocateAlignedPool (AllocationSize, Alignment);\r
   if (Memory != NULL) {\r
     Memory = CopyMem (Memory, Buffer, AllocationSize);\r


@@ -817,13 +996,18 @@ AllocateAlignedCopyPool (
 /**\r
   Copies a buffer to an allocated buffer of type EfiRuntimeServicesData at a specified alignment.\r
 \r
 /**\r
   Copies a buffer to an allocated buffer of type EfiRuntimeServicesData at a specified alignment.\r
 \r

-  @param  AllocationSize The number of bytes to allocate.\r
-  @param  Buffer The buffer to copy to the allocated buffer.\r
-  @param  Alignment The requested alignment of the allocation.  Must be a power of two.\r
-  If Alignment is zero, then byte alignment is used.\r
+  Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData type with an\r
+  alignment specified by Alignment.  The allocated buffer is returned.  If AllocationSize is 0,\r
+  then a valid buffer of 0 size is returned.  If there is not enough memory at the specified\r
+  alignment remaining to satisfy the request, then NULL is returned.\r
+  If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r

 \r
 \r

-  @return A pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  AllocationSize        The number of bytes to allocate.\r
+  @param  Buffer                The buffer to copy to the allocated buffer.\r
+  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.\r
+                                If Alignment is zero, then byte alignment is used.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -840,13 +1024,18 @@ AllocateAlignedRuntimeCopyPool (
 /**\r
   Copies a buffer to an allocated buffer of type EfiReservedMemoryType at a specified alignment.\r
 \r
 /**\r
   Copies a buffer to an allocated buffer of type EfiReservedMemoryType at a specified alignment.\r
 \r

-  @param  AllocationSize The number of bytes to allocate.\r
-  @param  Buffer The buffer to copy to the allocated buffer.\r
-  @param  Alignment The requested alignment of the allocation.  Must be a power of two.\r
-  If Alignment is zero, then byte alignment is used.\r
+  Allocates the number bytes specified by AllocationSize of type EfiReservedMemoryType type with an\r
+  alignment specified by Alignment.  The allocated buffer is returned.  If AllocationSize is 0,\r
+  then a valid buffer of 0 size is returned.  If there is not enough memory at the specified\r
+  alignment remaining to satisfy the request, then NULL is returned.\r
+  If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r

 \r
 \r

-  @return A pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.\r
-  If there is not enough memory remaining to satisfy the request, then NULL is returned.\r
+  @param  AllocationSize        The number of bytes to allocate.\r
+  @param  Buffer                The buffer to copy to the allocated buffer.\r
+  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.\r
+                                If Alignment is zero, then byte alignment is used.\r
+\r
+  @return A pointer to the allocated buffer or NULL if allocation fails.\r

 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r


@@ -864,7 +1053,12 @@ AllocateAlignedReservedCopyPool (
   Frees a buffer that was previously allocated with one of the aligned pool allocation functions \r
   in the Memory Allocation Library.\r
 \r
   Frees a buffer that was previously allocated with one of the aligned pool allocation functions \r
   in the Memory Allocation Library.\r
 \r

-  @param  Buffer Pointer to the buffer to free.\r
+  Frees the buffer specified by Buffer.  Buffer must have been allocated on a previous call to the\r
+  aligned pool allocation services of the Memory Allocation Library.\r
+  If Buffer was not allocated with an aligned pool allocation function in the Memory Allocation\r
+  Library, then ASSERT().\r
+\r
+  @param  Buffer                Pointer to the buffer to free.\r

 \r
 **/\r
 VOID\r
 \r
 **/\r
 VOID\r