NetworkPkg: Fix potential ASSERT if NetIp4IsUnicast is called

[mirror_edk2.git] / NetworkPkg / DnsDxe / DnsProtocol.c

diff --git a/NetworkPkg/DnsDxe/DnsProtocol.c b/NetworkPkg/DnsDxe/DnsProtocol.c
index f572b8b722ac0da5d46a7fef2a4481f6894ec569..0e7ed34b4e0c73e9d9691f90aa200b2053d36f33 100644 (file)
--- a/NetworkPkg/DnsDxe/DnsProtocol.c
+++ b/NetworkPkg/DnsDxe/DnsProtocol.c
@@ -1,7 +1,7 @@
 /** @file\r
 Implementation of EFI_DNS4_PROTOCOL and EFI_DNS6_PROTOCOL interfaces.\r
 \r
-Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -88,8 +88,8 @@ Dns4GetModeData (
     \r
   Instance = DNS_INSTANCE_FROM_THIS_PROTOCOL4 (This);\r
   if (Instance->State == DNS_STATE_UNCONFIGED) {\r
-    gBS->RestoreTPL (OldTpl);\r
-    return  EFI_NOT_STARTED;\r
+    Status = EFI_NOT_STARTED;\r
+    goto ON_EXIT;\r
   }\r
   \r
   ZeroMem (DnsModeData, sizeof (EFI_DNS4_MODE_DATA));\r
@@ -99,8 +99,7 @@ Dns4GetModeData (
   //\r
   Status = Dns4CopyConfigure (&DnsModeData->DnsConfigData, &Instance->Dns4CfgData);\r
   if (EFI_ERROR (Status)) {\r
-    gBS->RestoreTPL (OldTpl);\r
-    return Status;\r
+    goto ON_EXIT;\r
   }\r
 \r
   //\r
@@ -112,7 +111,12 @@ Dns4GetModeData (
   }\r
   DnsModeData->DnsServerCount = (UINT32) Index;\r
   ServerList = AllocatePool (sizeof (EFI_IPv4_ADDRESS) * DnsModeData->DnsServerCount);\r
-  ASSERT (ServerList != NULL);\r
+  if (ServerList == NULL) {\r
+    Status = EFI_OUT_OF_RESOURCES;\r
+    Dns4CleanConfigure (&DnsModeData->DnsConfigData);\r
+    goto ON_EXIT;\r
+  }\r
+  \r
   Index = 0;\r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &mDriverData->Dns4ServerList) {\r
     ServerItem = NET_LIST_USER_STRUCT (Entry, DNS4_SERVER_IP, AllServerLink);\r
@@ -130,7 +134,13 @@ Dns4GetModeData (
   }\r
   DnsModeData->DnsCacheCount = (UINT32) Index;\r
   CacheList = AllocatePool (sizeof (EFI_DNS4_CACHE_ENTRY) * DnsModeData->DnsCacheCount);\r
-  ASSERT (CacheList != NULL);\r
+  if (CacheList == NULL) {\r
+    Status = EFI_OUT_OF_RESOURCES;\r
+    Dns4CleanConfigure (&DnsModeData->DnsConfigData);\r
+    FreePool (ServerList);\r
+    goto ON_EXIT;\r
+  }\r
+  \r
   Index =0;\r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &mDriverData->Dns4CacheList) {\r
     CacheItem = NET_LIST_USER_STRUCT (Entry, DNS4_CACHE, AllCacheLink);\r
@@ -139,9 +149,9 @@ Dns4GetModeData (
   }\r
   DnsModeData->DnsCacheList = CacheList;\r
 \r
+ON_EXIT:\r
   gBS->RestoreTPL (OldTpl);\r
-  \r
-  return EFI_SUCCESS;\r
+  return Status;\r
 }\r
 \r
 /**\r
@@ -236,7 +246,7 @@ Dns4Configure (
     Netmask  = NTOHL (Netmask);\r
 \r
     if (!DnsConfigData->UseDefaultSetting &&\r
-       ((!IP4_IS_VALID_NETMASK (Netmask) || !NetIp4IsUnicast (Ip, Netmask)))) {\r
+        ((!IP4_IS_VALID_NETMASK (Netmask) || (Netmask != 0 && !NetIp4IsUnicast (Ip, Netmask))))) {\r
       Status = EFI_INVALID_PARAMETER;\r
       goto ON_EXIT;\r
     }\r
@@ -277,6 +287,7 @@ Dns4Configure (
     if (EFI_ERROR (Status)) {\r
       if (Instance->Dns4CfgData.DnsServerList != NULL) {\r
         FreePool (Instance->Dns4CfgData.DnsServerList);\r
+        Instance->Dns4CfgData.DnsServerList = NULL;\r
       }\r
       goto ON_EXIT;\r
     }\r
@@ -288,6 +299,7 @@ Dns4Configure (
     if (EFI_ERROR (Status)) {\r
       if (Instance->Dns4CfgData.DnsServerList != NULL) {\r
         FreePool (Instance->Dns4CfgData.DnsServerList);\r
+        Instance->Dns4CfgData.DnsServerList = NULL;\r
       }\r
       goto ON_EXIT;\r
     }\r
@@ -454,7 +466,7 @@ Dns4HostNameToIp (
   //\r
   // Construct QName.\r
   //\r
-  QueryName = DnsFillinQNameForQueryIp (TokenEntry->QueryHostName);\r
+  QueryName = NetLibCreateDnsQName (TokenEntry->QueryHostName);\r
   if (QueryName == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_EXIT;\r
@@ -493,6 +505,8 @@ Dns4HostNameToIp (
   //\r
   Status = DoDnsQuery (Instance, Packet);\r
   if (EFI_ERROR (Status)) {\r
+    Dns4RemoveTokenEntry (&Instance->Dns4TxTokens, TokenEntry);\r
+\r
     if (TokenEntry != NULL) {\r
       FreePool (TokenEntry);\r
     }\r
@@ -675,6 +689,8 @@ Dns4GeneralLookUp (
   //\r
   Status = DoDnsQuery (Instance, Packet);\r
   if (EFI_ERROR (Status)) {\r
+    Dns4RemoveTokenEntry (&Instance->Dns4TxTokens, TokenEntry);\r
+\r
     if (TokenEntry != NULL) {\r
       FreePool (TokenEntry);\r
     }\r
@@ -905,8 +921,8 @@ Dns6GetModeData (
     \r
   Instance  = DNS_INSTANCE_FROM_THIS_PROTOCOL6 (This);\r
   if (Instance->State == DNS_STATE_UNCONFIGED) {\r
-    gBS->RestoreTPL (OldTpl);\r
-    return  EFI_NOT_STARTED;\r
+    Status =  EFI_NOT_STARTED;\r
+    goto ON_EXIT;\r
   }\r
 \r
   ZeroMem (DnsModeData, sizeof (EFI_DNS6_MODE_DATA));\r
@@ -914,10 +930,9 @@ Dns6GetModeData (
   //\r
   // Get the current configuration data of this instance. \r
   //\r
-  Status = Dns6CopyConfigure(&DnsModeData->DnsConfigData, &Instance->Dns6CfgData);\r
+  Status = Dns6CopyConfigure (&DnsModeData->DnsConfigData, &Instance->Dns6CfgData);\r
   if (EFI_ERROR (Status)) {\r
-    gBS->RestoreTPL (OldTpl);\r
-    return Status;\r
+    goto ON_EXIT;\r
   }\r
   \r
   //\r
@@ -929,7 +944,12 @@ Dns6GetModeData (
   }\r
   DnsModeData->DnsServerCount = (UINT32) Index;\r
   ServerList = AllocatePool (sizeof(EFI_IPv6_ADDRESS) * DnsModeData->DnsServerCount);\r
-  ASSERT (ServerList != NULL);\r
+  if (ServerList == NULL) {\r
+    Status = EFI_OUT_OF_RESOURCES;\r
+    Dns6CleanConfigure (&DnsModeData->DnsConfigData);\r
+    goto ON_EXIT;\r
+  }\r
+  \r
   Index = 0;\r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &mDriverData->Dns6ServerList) {\r
     ServerItem = NET_LIST_USER_STRUCT (Entry, DNS6_SERVER_IP, AllServerLink);\r
@@ -947,7 +967,13 @@ Dns6GetModeData (
   }\r
   DnsModeData->DnsCacheCount = (UINT32) Index;\r
   CacheList = AllocatePool (sizeof(EFI_DNS6_CACHE_ENTRY) * DnsModeData->DnsCacheCount);\r
-  ASSERT (CacheList != NULL);\r
+  if (CacheList == NULL) {\r
+    Status = EFI_OUT_OF_RESOURCES;\r
+    Dns6CleanConfigure (&DnsModeData->DnsConfigData);\r
+    FreePool (ServerList);\r
+    goto ON_EXIT;\r
+  }\r
+  \r
   Index =0;\r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &mDriverData->Dns6CacheList) {\r
     CacheItem = NET_LIST_USER_STRUCT (Entry, DNS6_CACHE, AllCacheLink);\r
@@ -955,10 +981,10 @@ Dns6GetModeData (
     Index++;\r
   }\r
   DnsModeData->DnsCacheList = CacheList;\r
-\r
-  gBS->RestoreTPL (OldTpl);\r
   \r
-  return EFI_SUCCESS;\r
+ON_EXIT:\r
+  gBS->RestoreTPL (OldTpl);\r
+  return Status;\r
 }\r
 \r
 /**\r
@@ -1084,6 +1110,7 @@ Dns6Configure (
     if (EFI_ERROR (Status)) {\r
       if (Instance->Dns6CfgData.DnsServerList != NULL) {\r
         FreePool (Instance->Dns6CfgData.DnsServerList);\r
+        Instance->Dns6CfgData.DnsServerList = NULL;\r
       }\r
       goto ON_EXIT;\r
     }\r
@@ -1095,6 +1122,7 @@ Dns6Configure (
     if (EFI_ERROR (Status)) {\r
       if (Instance->Dns6CfgData.DnsServerList != NULL) {\r
         FreePool (Instance->Dns6CfgData.DnsServerList);\r
+        Instance->Dns6CfgData.DnsServerList = NULL;\r
       }\r
       goto ON_EXIT;\r
     }\r
@@ -1264,7 +1292,7 @@ Dns6HostNameToIp (
   //\r
   // Construct QName.\r
   //\r
-  QueryName = DnsFillinQNameForQueryIp (TokenEntry->QueryHostName);\r
+  QueryName = NetLibCreateDnsQName (TokenEntry->QueryHostName);\r
   if (QueryName == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_EXIT;\r
@@ -1303,6 +1331,8 @@ Dns6HostNameToIp (
   //\r
   Status = DoDnsQuery (Instance, Packet);\r
   if (EFI_ERROR (Status)) {\r
+    Dns6RemoveTokenEntry (&Instance->Dns6TxTokens, TokenEntry);\r
+    \r
     if (TokenEntry != NULL) {\r
       FreePool (TokenEntry);\r
     }\r
@@ -1488,6 +1518,8 @@ Dns6GeneralLookUp (
   //\r
   Status = DoDnsQuery (Instance, Packet);\r
   if (EFI_ERROR (Status)) {\r
+    Dns6RemoveTokenEntry (&Instance->Dns6TxTokens, TokenEntry);\r
+\r
     if (TokenEntry != NULL) {\r
       FreePool (TokenEntry);\r
     }\r