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

NetworkPkg: Replace ASSERT with error handling in DnsDxe 

v2:
* Use goto to simplify code logic.

This patch is used to replace ASSERT with error handling in
DnsDxe driver.

Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Cc: Zhang Lubo <lubo.zhang@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiaxin Wu <jiaxin.wu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
This commit is contained in:
Jiaxin Wu 2016-06-17 14:26:48 +08:00
parent 6b16c9e7ea
commit ac0f5843b5
1 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
NetworkPkg/DnsDxe/DnsProtocol.c
View File

@ -88,8 +88,8 @@ Dns4GetModeData (
Instance = DNS_INSTANCE_FROM_THIS_PROTOCOL4 (This); Instance = DNS_INSTANCE_FROM_THIS_PROTOCOL4 (This);
if (Instance->State == DNS_STATE_UNCONFIGED) { if (Instance->State == DNS_STATE_UNCONFIGED) {
gBS->RestoreTPL (OldTpl); Status = EFI_NOT_STARTED;
return EFI_NOT_STARTED; goto ON_EXIT;
} }
ZeroMem (DnsModeData, sizeof (EFI_DNS4_MODE_DATA)); ZeroMem (DnsModeData, sizeof (EFI_DNS4_MODE_DATA));
@ -99,8 +99,7 @@ Dns4GetModeData (
// //
Status = Dns4CopyConfigure (&DnsModeData->DnsConfigData, &Instance->Dns4CfgData); Status = Dns4CopyConfigure (&DnsModeData->DnsConfigData, &Instance->Dns4CfgData);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
gBS->RestoreTPL (OldTpl); goto ON_EXIT;
return Status;
} }
// //
@ -112,7 +111,12 @@ Dns4GetModeData (
} }
DnsModeData->DnsServerCount = (UINT32) Index; DnsModeData->DnsServerCount = (UINT32) Index;
ServerList = AllocatePool (sizeof (EFI_IPv4_ADDRESS) * DnsModeData->DnsServerCount); ServerList = AllocatePool (sizeof (EFI_IPv4_ADDRESS) * DnsModeData->DnsServerCount);
ASSERT (ServerList != NULL); if (ServerList == NULL) {
Status = EFI_OUT_OF_RESOURCES;
Dns4CleanConfigure (&DnsModeData->DnsConfigData);
goto ON_EXIT;
}
Index = 0; Index = 0;
NET_LIST_FOR_EACH_SAFE (Entry, Next, &mDriverData->Dns4ServerList) { NET_LIST_FOR_EACH_SAFE (Entry, Next, &mDriverData->Dns4ServerList) {
ServerItem = NET_LIST_USER_STRUCT (Entry, DNS4_SERVER_IP, AllServerLink); ServerItem = NET_LIST_USER_STRUCT (Entry, DNS4_SERVER_IP, AllServerLink);
@ -130,7 +134,13 @@ Dns4GetModeData (
} }
DnsModeData->DnsCacheCount = (UINT32) Index; DnsModeData->DnsCacheCount = (UINT32) Index;
CacheList = AllocatePool (sizeof (EFI_DNS4_CACHE_ENTRY) * DnsModeData->DnsCacheCount); CacheList = AllocatePool (sizeof (EFI_DNS4_CACHE_ENTRY) * DnsModeData->DnsCacheCount);
ASSERT (CacheList != NULL); if (CacheList == NULL) {
Status = EFI_OUT_OF_RESOURCES;
Dns4CleanConfigure (&DnsModeData->DnsConfigData);
FreePool (ServerList);
goto ON_EXIT;
}
Index =0; Index =0;
NET_LIST_FOR_EACH_SAFE (Entry, Next, &mDriverData->Dns4CacheList) { NET_LIST_FOR_EACH_SAFE (Entry, Next, &mDriverData->Dns4CacheList) {
CacheItem = NET_LIST_USER_STRUCT (Entry, DNS4_CACHE, AllCacheLink); CacheItem = NET_LIST_USER_STRUCT (Entry, DNS4_CACHE, AllCacheLink);
@ -139,9 +149,9 @@ Dns4GetModeData (
} }
DnsModeData->DnsCacheList = CacheList; DnsModeData->DnsCacheList = CacheList;
ON_EXIT:
gBS->RestoreTPL (OldTpl); gBS->RestoreTPL (OldTpl);
return Status;
return EFI_SUCCESS;
} }
/** /**
@ -909,8 +919,8 @@ Dns6GetModeData (
Instance = DNS_INSTANCE_FROM_THIS_PROTOCOL6 (This); Instance = DNS_INSTANCE_FROM_THIS_PROTOCOL6 (This);
if (Instance->State == DNS_STATE_UNCONFIGED) { if (Instance->State == DNS_STATE_UNCONFIGED) {
gBS->RestoreTPL (OldTpl); Status = EFI_NOT_STARTED;
return EFI_NOT_STARTED; goto ON_EXIT;
} }
ZeroMem (DnsModeData, sizeof (EFI_DNS6_MODE_DATA)); ZeroMem (DnsModeData, sizeof (EFI_DNS6_MODE_DATA));
@ -918,10 +928,9 @@ Dns6GetModeData (
// //
// Get the current configuration data of this instance. // Get the current configuration data of this instance.
// //
Status = Dns6CopyConfigure(&DnsModeData->DnsConfigData, &Instance->Dns6CfgData); Status = Dns6CopyConfigure (&DnsModeData->DnsConfigData, &Instance->Dns6CfgData);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
gBS->RestoreTPL (OldTpl); goto ON_EXIT;
return Status;
} }
// //
@ -933,7 +942,12 @@ Dns6GetModeData (
} }
DnsModeData->DnsServerCount = (UINT32) Index; DnsModeData->DnsServerCount = (UINT32) Index;
ServerList = AllocatePool (sizeof(EFI_IPv6_ADDRESS) * DnsModeData->DnsServerCount); ServerList = AllocatePool (sizeof(EFI_IPv6_ADDRESS) * DnsModeData->DnsServerCount);
ASSERT (ServerList != NULL); if (ServerList == NULL) {
Status = EFI_OUT_OF_RESOURCES;
Dns6CleanConfigure (&DnsModeData->DnsConfigData);
goto ON_EXIT;
}
Index = 0; Index = 0;
NET_LIST_FOR_EACH_SAFE (Entry, Next, &mDriverData->Dns6ServerList) { NET_LIST_FOR_EACH_SAFE (Entry, Next, &mDriverData->Dns6ServerList) {
ServerItem = NET_LIST_USER_STRUCT (Entry, DNS6_SERVER_IP, AllServerLink); ServerItem = NET_LIST_USER_STRUCT (Entry, DNS6_SERVER_IP, AllServerLink);
@ -951,7 +965,13 @@ Dns6GetModeData (
} }
DnsModeData->DnsCacheCount = (UINT32) Index; DnsModeData->DnsCacheCount = (UINT32) Index;
CacheList = AllocatePool (sizeof(EFI_DNS6_CACHE_ENTRY) * DnsModeData->DnsCacheCount); CacheList = AllocatePool (sizeof(EFI_DNS6_CACHE_ENTRY) * DnsModeData->DnsCacheCount);
ASSERT (CacheList != NULL); if (CacheList == NULL) {
Status = EFI_OUT_OF_RESOURCES;
Dns6CleanConfigure (&DnsModeData->DnsConfigData);
FreePool (ServerList);
goto ON_EXIT;
}
Index =0; Index =0;
NET_LIST_FOR_EACH_SAFE (Entry, Next, &mDriverData->Dns6CacheList) { NET_LIST_FOR_EACH_SAFE (Entry, Next, &mDriverData->Dns6CacheList) {
CacheItem = NET_LIST_USER_STRUCT (Entry, DNS6_CACHE, AllCacheLink); CacheItem = NET_LIST_USER_STRUCT (Entry, DNS6_CACHE, AllCacheLink);
@ -959,10 +979,10 @@ Dns6GetModeData (
Index++; Index++;
} }
DnsModeData->DnsCacheList = CacheList; DnsModeData->DnsCacheList = CacheList;
gBS->RestoreTPL (OldTpl);
return EFI_SUCCESS; ON_EXIT:
gBS->RestoreTPL (OldTpl);
return Status;
} }
/** /**