Jaben, Stefan: could you please review the attached change? Both patch format and full file are attached.
StdLib/LibC/StdLib/Malloc.c: Revert cast removal to fix GCC build breakage. The cast to (void**) is needed for the last parameter of the AllocatePool call in malloc(). This is because type CPOOL_HEAD** is not automatically promoted to void**, as required by AllocatePool(). This was originally addressed in SVN revision 15474 but removed again in 15664. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Daryl McDaniel <[email protected]> Reviewed by: ... Daryl McDaniel
/** @file Definitions for memory allocation routines: calloc, malloc, realloc, free. The order and contiguity of storage allocated by successive calls to the calloc, malloc, and realloc functions is unspecified. The pointer returned if the allocation succeeds is suitably aligned so that it may be assigned to a pointer of any type of object and then used to access such an object or an array of such objects in the space allocated (until the space is explicitly freed or reallocated). Each such allocation shall yield a pointer to an object disjoint from any other object. The pointer returned points to the start (lowest byte address) of the allocated space. If the space can not be allocated, a null pointer is returned. If the size of the space requested is zero, the behavior is implementation-defined; the value returned shall be either a null pointer or a unique pointer. The value of a pointer that refers to freed space is indeterminate. Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR> This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at http://opensource.org/licenses/bsd-license.php THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. */ #include <Uefi.h> #include <Library/MemoryAllocationLib.h> #include <Library/UefiBootServicesTableLib.h> #include <Library/BaseLib.h> #include <Library/BaseMemoryLib.h> #include <Library/DebugLib.h> #include <LibConfig.h> #include <assert.h> #include <stdlib.h> #include <errno.h> #define CPOOL_HEAD_SIGNATURE SIGNATURE_32('C','p','h','d') /** The UEFI functions do not provide a way to determine the size of an allocated region of memory given just a pointer to the start of that region. Since this is required for the implementation of realloc, the memory head structure, CPOOL_HEAD, containing the necessary information is prepended to the requested space. The order of members is important. This structure is 8-byte aligned, as per the UEFI specification for memory allocation functions. By specifying Size as a 64-bit value and placing it immediately before Data, it ensures that Data will always be 8-byte aligned. On IA32 systems, this structure is 24 bytes long, excluding Data. On X64 systems, this structure is 32 bytes long, excluding Data. **/ typedef struct { LIST_ENTRY List; UINT32 Signature; UINT64 Size; CHAR8 Data[1]; } CPOOL_HEAD; // List of memory allocated by malloc/calloc/etc. static LIST_ENTRY MemPoolHead = INITIALIZE_LIST_HEAD_VARIABLE(MemPoolHead); /****************************/ /** The malloc function allocates space for an object whose size is specified by size and whose value is indeterminate. This implementation uses the UEFI memory allocation boot services to get a region of memory that is 8-byte aligned and of the specified size. The region is allocated with type EfiLoaderData. @param size Size, in bytes, of the region to allocate. @return NULL is returned if the space could not be allocated and errno contains the cause. Otherwise, a pointer to an 8-byte aligned region of the requested size is returned.<BR> If NULL is returned, errno may contain: - EINVAL: Requested Size is zero. - ENOMEM: Memory could not be allocated. **/ void * malloc(size_t Size) { CPOOL_HEAD *Head; void *RetVal; EFI_STATUS Status; UINTN NodeSize; if( Size == 0) { errno = EINVAL; // Make errno diffenent, just in case of a lingering ENOMEM. DEBUG((DEBUG_ERROR, "ERROR malloc: Zero Size\n")); return NULL; } NodeSize = (UINTN)(Size + sizeof(CPOOL_HEAD)); DEBUG((DEBUG_POOL, "malloc(%d): NodeSz: %d", Size, NodeSize)); Status = gBS->AllocatePool( EfiLoaderData, NodeSize, (void**)&Head); if( Status != EFI_SUCCESS) { RetVal = NULL; errno = ENOMEM; DEBUG((DEBUG_ERROR, "\nERROR malloc: AllocatePool returned %r\n", Status)); } else { assert(Head != NULL); // Fill out the pool header Head->Signature = CPOOL_HEAD_SIGNATURE; Head->Size = NodeSize; // Add this node to the list (void)InsertTailList(&MemPoolHead, (LIST_ENTRY *)Head); // Return a pointer to the data RetVal = (void*)Head->Data; DEBUG((DEBUG_POOL, " Head: %p, Returns %p\n", Head, RetVal)); } return RetVal; } /** The calloc function allocates space for an array of Num objects, each of whose size is Size. The space is initialized to all bits zero. This implementation uses the UEFI memory allocation boot services to get a region of memory that is 8-byte aligned and of the specified size. The region is allocated with type EfiLoaderData. @param Num Number of objects to allocate. @param Size Size, in bytes, of the objects to allocate space for. @return NULL is returned if the space could not be allocated and errno contains the cause. Otherwise, a pointer to an 8-byte aligned region of the requested size is returned. **/ void * calloc(size_t Num, size_t Size) { void *RetVal; size_t NumSize; NumSize = Num * Size; RetVal = NULL; if (NumSize != 0) { RetVal = malloc(NumSize); if( RetVal != NULL) { (VOID)ZeroMem( RetVal, NumSize); } } DEBUG((DEBUG_POOL, "0x%p = calloc(%d, %d)\n", RetVal, Num, Size)); return RetVal; } /** The free function causes the space pointed to by Ptr to be deallocated, that is, made available for further allocation. If Ptr is a null pointer, no action occurs. Otherwise, if the argument does not match a pointer earlier returned by the calloc, malloc, or realloc function, or if the space has been deallocated by a call to free or realloc, the behavior is undefined. @param Ptr Pointer to a previously allocated region of memory to be freed. **/ void free(void *Ptr) { CPOOL_HEAD *Head; Head = BASE_CR(Ptr, CPOOL_HEAD, Data); assert(Head != NULL); DEBUG((DEBUG_POOL, "free(%p): Head: %p\n", Ptr, Head)); if(Ptr != NULL) { if (Head->Signature == CPOOL_HEAD_SIGNATURE) { (void) RemoveEntryList((LIST_ENTRY *)Head); // Remove this node from the malloc pool (void) gBS->FreePool (Head); // Now free the associated memory } else { errno = EFAULT; DEBUG((DEBUG_ERROR, "ERROR free(0x%p): Signature is 0x%8X, expected 0x%8X\n", Ptr, Head->Signature, CPOOL_HEAD_SIGNATURE)); } } DEBUG((DEBUG_POOL, "free Done\n")); } /** The realloc function changes the size of the object pointed to by Ptr to the size specified by NewSize. The contents of the object are unchanged up to the lesser of the new and old sizes. If the new size is larger, the value of the newly allocated portion of the object is indeterminate. If Ptr is a null pointer, the realloc function behaves like the malloc function for the specified size. If Ptr does not match a pointer earlier returned by the calloc, malloc, or realloc function, or if the space has been deallocated by a call to the free or realloc function, the behavior is undefined. If the space cannot be allocated, the object pointed to by Ptr is unchanged. If NewSize is zero and Ptr is not a null pointer, the object it points to is freed. This implementation uses the UEFI memory allocation boot services to get a region of memory that is 8-byte aligned and of the specified size. The region is allocated with type EfiLoaderData. The following combinations of Ptr and NewSize can occur:<BR> Ptr NewSize<BR> -------- -------------------<BR> - NULL 0 Returns NULL; - NULL > 0 Same as malloc(NewSize) - invalid X Returns NULL; - valid NewSize >= OldSize Returns malloc(NewSize) with Oldsize bytes copied from Ptr - valid NewSize < OldSize Returns new buffer with Oldsize bytes copied from Ptr - valid 0 Return NULL. Frees Ptr. @param Ptr Pointer to a previously allocated region of memory to be resized. @param NewSize Size, in bytes, of the new object to allocate space for. @return NULL is returned if the space could not be allocated and errno contains the cause. Otherwise, a pointer to an 8-byte aligned region of the requested size is returned. If NewSize is zero, NULL is returned and errno will be unchanged. **/ void * realloc(void *Ptr, size_t ReqSize) { void *RetVal = NULL; CPOOL_HEAD *Head = NULL; size_t OldSize = 0; size_t NewSize; size_t NumCpy; // Find out the size of the OLD memory region if( Ptr != NULL) { Head = BASE_CR (Ptr, CPOOL_HEAD, Data); assert(Head != NULL); if (Head->Signature != CPOOL_HEAD_SIGNATURE) { errno = EFAULT; DEBUG((DEBUG_ERROR, "ERROR realloc(0x%p): Signature is 0x%8X, expected 0x%8X\n", Ptr, Head->Signature, CPOOL_HEAD_SIGNATURE)); return NULL; } OldSize = (size_t)Head->Size; } // At this point, Ptr is either NULL or a valid pointer to an allocated space NewSize = (size_t)(ReqSize + (sizeof(CPOOL_HEAD))); if( ReqSize > 0) { RetVal = malloc(NewSize); // Get the NEW memory region if( Ptr != NULL) { // If there is an OLD region... if( RetVal != NULL) { // and the NEW region was successfully allocated NumCpy = OldSize; if( OldSize > NewSize) { NumCpy = NewSize; } (VOID)CopyMem( RetVal, Ptr, NumCpy); // Copy old data to the new region. free( Ptr); // and reclaim the old region. } else { errno = ENOMEM; } } } else { free( Ptr); // Reclaim the old region. } DEBUG((DEBUG_POOL, "0x%p = realloc(%p, %d): Head: %p NewSz: %d\n", RetVal, Ptr, ReqSize, Head, NewSize)); return RetVal; }
Malloc.patch
Description: Malloc.patch
------------------------------------------------------------------------------ Want fast and easy access to all the code in your enterprise? Index and search up to 200,000 lines of code with a free copy of Black Duck Code Sight - the same software that powers the world's largest code search on Ohloh, the Black Duck Open Hub! Try it now. http://p.sf.net/sfu/bds
_______________________________________________ edk2-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/edk2-devel
