From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 66C4A1A1E60 for ; Tue, 13 Sep 2016 23:46:03 -0700 (PDT) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP; 13 Sep 2016 23:45:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,332,1470726000"; d="scan'208";a="8127372" Received: from jiaxinwu-mobl2.ccr.corp.intel.com ([10.239.196.89]) by fmsmga005.fm.intel.com with ESMTP; 13 Sep 2016 23:45:51 -0700 From: Jiaxin Wu To: edk2-devel@lists.01.org Cc: Hegde Nagaraj P , Fu Siyuan , Ye Ting Date: Wed, 14 Sep 2016 14:45:50 +0800 Message-Id: <1473835550-58760-1-git-send-email-jiaxin.wu@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.1 Subject: [Patch] NetworkPkg: Correct the DNS token return status by RCODE X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Sep 2016 06:46:03 -0000 When HostNameToIp() and GeneralLookUp() are called with a invalid host name, RCODE (4 bit field is set as part of responses) error will returned in packet to identify the domain name referenced in the query does not exist. So, EFI_NOT_FOUND should be returned directly. Current implementation only check the RCODE in successful condition. Need update the code for more error check according to RFC 1035 4.1.1 section. Cc: Hegde Nagaraj P Cc: Fu Siyuan Cc: Ye Ting Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jiaxin Wu --- NetworkPkg/DnsDxe/DnsImpl.c | 104 +++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 64 deletions(-) diff --git a/NetworkPkg/DnsDxe/DnsImpl.c b/NetworkPkg/DnsDxe/DnsImpl.c index cfaa4c7..3f3b756 100644 --- a/NetworkPkg/DnsDxe/DnsImpl.c +++ b/NetworkPkg/DnsDxe/DnsImpl.c @@ -1230,12 +1230,20 @@ ParseDnsResponse ( // // Continue Check Some Errors. // if (DnsHeader->Flags.Bits.RCode != DNS_FLAGS_RCODE_NO_ERROR || DnsHeader->AnswersNum < 1 || \ DnsHeader->Flags.Bits.QR != DNS_FLAGS_QR_RESPONSE) { - Status = EFI_ABORTED; - goto ON_EXIT; + // + // The domain name referenced in the query does not exist. + // + if (DnsHeader->Flags.Bits.RCode == DNS_FLAGS_RCODE_NAME_ERROR) { + Status = EFI_NOT_FOUND; + } else { + Status = EFI_DEVICE_ERROR; + } + + goto ON_COMPLETE; } // // Do some buffer allocations. // @@ -1404,27 +1412,12 @@ ParseDnsResponse ( HostAddr4 = Dns4TokenEntry->Token->RspData.H2AData->IpList; AnswerData = (UINT8 *) AnswerSection + sizeof (*AnswerSection); CopyMem (&HostAddr4[IpCount], AnswerData, sizeof (EFI_IPv4_ADDRESS)); - // - // Update DNS cache dynamically. - // - if (Dns4CacheEntry != NULL) { - if (Dns4CacheEntry->HostName != NULL) { - FreePool (Dns4CacheEntry->HostName); - } - - if (Dns4CacheEntry->IpAddress != NULL) { - FreePool (Dns4CacheEntry->IpAddress); - } - - FreePool (Dns4CacheEntry); - } - // - // Allocate new CacheEntry pool. + // Allocate new CacheEntry pool to update DNS cache dynamically. // Dns4CacheEntry = AllocateZeroPool (sizeof (EFI_DNS4_CACHE_ENTRY)); if (Dns4CacheEntry == NULL) { Status = EFI_OUT_OF_RESOURCES; goto ON_EXIT; @@ -1446,11 +1439,23 @@ ParseDnsResponse ( Dns4CacheEntry->Timeout = MIN (CNameTtl, AnswerSection->Ttl); } else { Dns4CacheEntry->Timeout = MAX (CNameTtl, AnswerSection->Ttl); } - UpdateDns4Cache (&mDriverData->Dns4CacheList, FALSE, TRUE, *Dns4CacheEntry); + UpdateDns4Cache (&mDriverData->Dns4CacheList, FALSE, TRUE, *Dns4CacheEntry); + + // + // Free allocated CacheEntry pool. + // + FreePool (Dns4CacheEntry->HostName); + Dns4CacheEntry->HostName = NULL; + + FreePool (Dns4CacheEntry->IpAddress); + Dns4CacheEntry->IpAddress = NULL; + + FreePool (Dns4CacheEntry); + Dns4CacheEntry = NULL; IpCount ++; Status = EFI_SUCCESS; break; case DNS_TYPE_AAAA: @@ -1461,27 +1466,12 @@ ParseDnsResponse ( HostAddr6 = Dns6TokenEntry->Token->RspData.H2AData->IpList; AnswerData = (UINT8 *) AnswerSection + sizeof (*AnswerSection); CopyMem (&HostAddr6[IpCount], AnswerData, sizeof (EFI_IPv6_ADDRESS)); - // - // Update DNS cache dynamically. - // - if (Dns6CacheEntry != NULL) { - if (Dns6CacheEntry->HostName != NULL) { - FreePool (Dns6CacheEntry->HostName); - } - - if (Dns6CacheEntry->IpAddress != NULL) { - FreePool (Dns6CacheEntry->IpAddress); - } - - FreePool (Dns6CacheEntry); - } - // - // Allocate new CacheEntry pool. + // Allocate new CacheEntry pool to update DNS cache dynamically. // Dns6CacheEntry = AllocateZeroPool (sizeof (EFI_DNS6_CACHE_ENTRY)); if (Dns6CacheEntry == NULL) { Status = EFI_OUT_OF_RESOURCES; goto ON_EXIT; @@ -1503,11 +1493,23 @@ ParseDnsResponse ( Dns6CacheEntry->Timeout = MIN (CNameTtl, AnswerSection->Ttl); } else { Dns6CacheEntry->Timeout = MAX (CNameTtl, AnswerSection->Ttl); } - UpdateDns6Cache (&mDriverData->Dns6CacheList, FALSE, TRUE, *Dns6CacheEntry); + UpdateDns6Cache (&mDriverData->Dns6CacheList, FALSE, TRUE, *Dns6CacheEntry); + + // + // Free allocated CacheEntry pool. + // + FreePool (Dns6CacheEntry->HostName); + Dns6CacheEntry->HostName = NULL; + + FreePool (Dns6CacheEntry->IpAddress); + Dns6CacheEntry->IpAddress = NULL; + + FreePool (Dns6CacheEntry); + Dns6CacheEntry = NULL; IpCount ++; Status = EFI_SUCCESS; break; case DNS_TYPE_CNAME: @@ -1556,11 +1558,12 @@ ParseDnsResponse ( Status = EFI_UNSUPPORTED; goto ON_EXIT; } } } - + +ON_COMPLETE: // // Parsing is complete, free the sending packet and signal Event here. // if (Item != NULL && Item->Value != NULL) { NetbufFree ((NET_BUF *) (Item->Value)); @@ -1582,37 +1585,10 @@ ParseDnsResponse ( gBS->SignalEvent (Dns6TokenEntry->Token->Event); DispatchDpc (); } } - // - // Free allocated CacheEntry pool. - // - if (Dns4CacheEntry != NULL) { - if (Dns4CacheEntry->HostName != NULL) { - FreePool (Dns4CacheEntry->HostName); - } - - if (Dns4CacheEntry->IpAddress != NULL) { - FreePool (Dns4CacheEntry->IpAddress); - } - - FreePool (Dns4CacheEntry); - } - - if (Dns6CacheEntry != NULL) { - if (Dns6CacheEntry->HostName != NULL) { - FreePool (Dns6CacheEntry->HostName); - } - - if (Dns6CacheEntry->IpAddress != NULL) { - FreePool (Dns6CacheEntry->IpAddress); - } - - FreePool (Dns6CacheEntry); - } - ON_EXIT: gBS->RestoreTPL (OldTpl); return Status; } -- 1.9.5.msysgit.1