tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/Ip4Dxe: return error on memory allocate failure instead of ASSERT. 

This patch updates the IP4 driver to use error status code instead of ASSERT
if failed to allocate memory buffer.

Reviewed-by: Ye Ting <ting.ye@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
This commit is contained in:
Fu Siyuan 2017-12-13 10:42:42 +08:00
parent a7912d4ad8
commit 72bdc5f093
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.c
View File

@ -293,8 +293,12 @@ Ip4Config2IpToStr (
@param[in] IpCount The size of IPv4 address list. @param[in] IpCount The size of IPv4 address list.
@param[out] Str The string contains several decimal dotted @param[out] Str The string contains several decimal dotted
IPv4 addresses separated by space. IPv4 addresses separated by space.
@retval EFI_SUCCESS Operation is success.
@retval EFI_OUT_OF_RESOURCES Error occurs in allocating memory.
**/ **/
VOID EFI_STATUS
Ip4Config2IpListToStr ( Ip4Config2IpListToStr (
IN EFI_IPv4_ADDRESS *Ip, IN EFI_IPv4_ADDRESS *Ip,
IN UINTN IpCount, IN UINTN IpCount,
@ -317,7 +321,9 @@ Ip4Config2IpListToStr (
TempIp = Ip + Index; TempIp = Ip + Index;
if (TempStr == NULL) { if (TempStr == NULL) {
TempStr = AllocateZeroPool(2 * IP4_STR_MAX_SIZE); TempStr = AllocateZeroPool(2 * IP4_STR_MAX_SIZE);
ASSERT(TempStr != NULL); if (TempStr == NULL) {
return EFI_OUT_OF_RESOURCES;
}
} }
UnicodeSPrint ( UnicodeSPrint (
@ -347,6 +353,8 @@ Ip4Config2IpListToStr (
if (TempStr != NULL) { if (TempStr != NULL) {
FreePool(TempStr); FreePool(TempStr);
} }
return EFI_SUCCESS;
} }
/** /**
@ -518,7 +526,7 @@ Ip4Config2ConvertConfigNvDataToIfrNvData (
Ip4Config2IpToStr (&Ip4Info->StationAddress, IfrNvData->StationAddress); Ip4Config2IpToStr (&Ip4Info->StationAddress, IfrNvData->StationAddress);
Ip4Config2IpToStr (&Ip4Info->SubnetMask, IfrNvData->SubnetMask); Ip4Config2IpToStr (&Ip4Info->SubnetMask, IfrNvData->SubnetMask);
Ip4Config2IpToStr (&GatewayAddress, IfrNvData->GatewayAddress); Ip4Config2IpToStr (&GatewayAddress, IfrNvData->GatewayAddress);
Ip4Config2IpListToStr (DnsAddress, DnsCount, IfrNvData->DnsAddress); Status = Ip4Config2IpListToStr (DnsAddress, DnsCount, IfrNvData->DnsAddress);
Exit: Exit:
@ -914,7 +922,10 @@ Ip4FormExtractConfig (
ConfigRequestHdr = HiiConstructConfigHdr (&gIp4Config2NvDataGuid, mIp4Config2StorageName, Private->ChildHandle); ConfigRequestHdr = HiiConstructConfigHdr (&gIp4Config2NvDataGuid, mIp4Config2StorageName, Private->ChildHandle);
Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16); Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);
ConfigRequest = AllocateZeroPool (Size); ConfigRequest = AllocateZeroPool (Size);
ASSERT (ConfigRequest != NULL); if (ConfigRequest == NULL) {
Status = EFI_OUT_OF_RESOURCES;
goto Failure;
}
AllocatedRequest = TRUE; AllocatedRequest = TRUE;
UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize); UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize);