From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id E0CAD1A1E48 for ; Tue, 6 Sep 2016 02:07:18 -0700 (PDT) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP; 06 Sep 2016 02:07:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,291,1470726000"; d="scan'208";a="4926477" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga005.fm.intel.com with ESMTP; 06 Sep 2016 02:07:18 -0700 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 6 Sep 2016 02:07:17 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.109]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.91]) with mapi id 14.03.0248.002; Tue, 6 Sep 2016 17:07:15 +0800 From: "Fu, Siyuan" To: "Wu, Jiaxin" , "edk2-devel@lists.01.org" CC: "Ye, Ting" Thread-Topic: [edk2] [PATCH v2] NetworkPkg/DnsDxe: Handle CNAME type responded from the name server Thread-Index: AQHSCBvOmz9zx/j0q0ywoVFdDzw0q6BsK9iQ Date: Tue, 6 Sep 2016 09:07:15 +0000 Message-ID: References: <1473151854-70952-1-git-send-email-jiaxin.wu@intel.com> In-Reply-To: <1473151854-70952-1-git-send-email-jiaxin.wu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_IC x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOGExYWI1MTAtNzNjYi00ZTI5LThhYjYtZjUxYjllZDIwZTU2IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6IkNTQ2JqczRvbWRoeU1QN1wvU2xZcXVLekJBTnk5NzV0YlwvS0N6bWFaXC9JdlE9In0= x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH v2] NetworkPkg/DnsDxe: Handle CNAME type responded from the name server 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: Tue, 06 Sep 2016 09:07:19 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Fu Siyuan > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of > Jiaxin Wu > Sent: Tuesday, September 6, 2016 4:51 PM > To: edk2-devel@lists.01.org > Cc: Ye, Ting ; Fu, Siyuan > Subject: [edk2] [PATCH v2] NetworkPkg/DnsDxe: Handle CNAME type responded > from the name server >=20 > v2: > * Code refine. > * For DnsCache, the minimum value of TTL is selected between CNAME and > A/AAAA record. >=20 > According RFC 1034 - 3.6.2, if the query name is an alias, the name serve= r > will include the CNAME record in the response and restart the query at th= e > domain name specified in the data field of the CNAME record. RFC also > provides > one example server action when A query received: >=20 > Suppose a name server was processing a query with for USCISIC.ARPA, askin= g > for > type A information, and had the following resource records: > USC-ISIC.ARPA IN CNAME C.ISI.EDU > C.ISI.EDU IN A 10.0.0.52 > Both of these RRs would be returned in the response to the type A query. >=20 > Currently, DnsDxe driver doesn't handle the CNAME type response, which > will cause > any exception result. The driver need continue the packet parsing while > CNAME type > record parsed. So, this patch is used to handle it correctly. >=20 > 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 | 81 +++++++++++++++++++++++++++++----------= - > ----- > 1 file changed, 52 insertions(+), 29 deletions(-) >=20 > diff --git a/NetworkPkg/DnsDxe/DnsImpl.c b/NetworkPkg/DnsDxe/DnsImpl.c > index 360f68e..cfaa4c7 100644 > --- a/NetworkPkg/DnsDxe/DnsImpl.c > +++ b/NetworkPkg/DnsDxe/DnsImpl.c > @@ -1125,10 +1125,11 @@ ParseDnsResponse ( > DNS6_TOKEN_ENTRY *Dns6TokenEntry; >=20 > UINT32 IpCount; > UINT32 RRCount; > UINT32 AnswerSectionNum; > + UINT32 CNameTtl; >=20 > EFI_IPv4_ADDRESS *HostAddr4; > EFI_IPv6_ADDRESS *HostAddr6; >=20 > EFI_DNS4_CACHE_ENTRY *Dns4CacheEntry; > @@ -1146,10 +1147,11 @@ ParseDnsResponse ( > Dns6TokenEntry =3D NULL; >=20 > IpCount =3D 0; > RRCount =3D 0; > AnswerSectionNum =3D 0; > + CNameTtl =3D 0; >=20 > HostAddr4 =3D NULL; > HostAddr6 =3D NULL; >=20 > Dns4CacheEntry =3D NULL; > @@ -1231,17 +1233,10 @@ ParseDnsResponse ( > if (DnsHeader->Flags.Bits.RCode !=3D DNS_FLAGS_RCODE_NO_ERROR || > DnsHeader->AnswersNum < 1 || \ > DnsHeader->Flags.Bits.QR !=3D DNS_FLAGS_QR_RESPONSE) { > Status =3D EFI_ABORTED; > goto ON_EXIT; > } > - > - // > - // Free the sending packet. > - // > - if (Item->Value !=3D NULL) { > - NetbufFree ((NET_BUF *) (Item->Value)); > - } >=20 > // > // Do some buffer allocations. > // > if (Instance->Service->IpVersion =3D=3D IP_VERSION_4) { > @@ -1288,40 +1283,42 @@ ParseDnsResponse ( > // > // It's the GeneralLookUp querying. > // > Dns6TokenEntry->Token->RspData.GLookupData =3D AllocatePool (sizeo= f > (DNS_RESOURCE_RECORD)); > if (Dns6TokenEntry->Token->RspData.GLookupData =3D=3D NULL) { > - Status =3D EFI_UNSUPPORTED; > + Status =3D EFI_OUT_OF_RESOURCES; > goto ON_EXIT; > } > Dns6TokenEntry->Token->RspData.GLookupData->RRList =3D AllocatePoo= l > (DnsHeader->AnswersNum * sizeof (DNS_RESOURCE_RECORD)); > if (Dns6TokenEntry->Token->RspData.GLookupData->RRList =3D=3D NULL= ) { > - Status =3D EFI_UNSUPPORTED; > + Status =3D EFI_OUT_OF_RESOURCES; > goto ON_EXIT; > } > } else { > // > // It's not the GeneralLookUp querying. Check the Query type. > // > if (QuerySection->Type =3D=3D DNS_TYPE_AAAA) { > Dns6TokenEntry->Token->RspData.H2AData =3D AllocatePool (sizeof > (DNS6_HOST_TO_ADDR_DATA)); > if (Dns6TokenEntry->Token->RspData.H2AData =3D=3D NULL) { > - Status =3D EFI_UNSUPPORTED; > + Status =3D EFI_OUT_OF_RESOURCES; > goto ON_EXIT; > } > Dns6TokenEntry->Token->RspData.H2AData->IpList =3D AllocatePool > (DnsHeader->AnswersNum * sizeof (EFI_IPv6_ADDRESS)); > if (Dns6TokenEntry->Token->RspData.H2AData->IpList =3D=3D NULL) = { > - Status =3D EFI_UNSUPPORTED; > + Status =3D EFI_OUT_OF_RESOURCES; > goto ON_EXIT; > } > } else { > Status =3D EFI_UNSUPPORTED; > goto ON_EXIT; > } > } > } >=20 > + Status =3D EFI_NOT_FOUND; > + > // > // Processing AnswerSection. > // > while (AnswerSectionNum < DnsHeader->AnswersNum) { > // > @@ -1348,51 +1345,53 @@ ParseDnsResponse ( > // > // Fill the ResourceRecord. > // > Dns4RR[RRCount].QName =3D AllocateZeroPool (AsciiStrLen (QueryName= ) + > 1); > if (Dns4RR[RRCount].QName =3D=3D NULL) { > - Status =3D EFI_UNSUPPORTED; > + Status =3D EFI_OUT_OF_RESOURCES; > goto ON_EXIT; > } > CopyMem (Dns4RR[RRCount].QName, QueryName, AsciiStrLen (QueryName)= ); > Dns4RR[RRCount].QType =3D AnswerSection->Type; > Dns4RR[RRCount].QClass =3D AnswerSection->Class; > Dns4RR[RRCount].TTL =3D AnswerSection->Ttl; > Dns4RR[RRCount].DataLength =3D AnswerSection->DataLength; > Dns4RR[RRCount].RData =3D AllocateZeroPool > (Dns4RR[RRCount].DataLength); > if (Dns4RR[RRCount].RData =3D=3D NULL) { > - Status =3D EFI_UNSUPPORTED; > + Status =3D EFI_OUT_OF_RESOURCES; > goto ON_EXIT; > } > CopyMem (Dns4RR[RRCount].RData, AnswerData, > Dns4RR[RRCount].DataLength); >=20 > RRCount ++; > + Status =3D EFI_SUCCESS; > } else if (Instance->Service->IpVersion =3D=3D IP_VERSION_6 && > Dns6TokenEntry->GeneralLookUp) { > Dns6RR =3D Dns6TokenEntry->Token->RspData.GLookupData->RRList; > AnswerData =3D (UINT8 *) AnswerSection + sizeof (*AnswerSection); >=20 > // > // Fill the ResourceRecord. > // > Dns6RR[RRCount].QName =3D AllocateZeroPool (AsciiStrLen (QueryName= ) + > 1); > if (Dns6RR[RRCount].QName =3D=3D NULL) { > - Status =3D EFI_UNSUPPORTED; > + Status =3D EFI_OUT_OF_RESOURCES; > goto ON_EXIT; > } > CopyMem (Dns6RR[RRCount].QName, QueryName, AsciiStrLen (QueryName)= ); > Dns6RR[RRCount].QType =3D AnswerSection->Type; > Dns6RR[RRCount].QClass =3D AnswerSection->Class; > Dns6RR[RRCount].TTL =3D AnswerSection->Ttl; > Dns6RR[RRCount].DataLength =3D AnswerSection->DataLength; > Dns6RR[RRCount].RData =3D AllocateZeroPool > (Dns6RR[RRCount].DataLength); > if (Dns6RR[RRCount].RData =3D=3D NULL) { > - Status =3D EFI_UNSUPPORTED; > + Status =3D EFI_OUT_OF_RESOURCES; > goto ON_EXIT; > } > CopyMem (Dns6RR[RRCount].RData, AnswerData, > Dns6RR[RRCount].DataLength); >=20 > RRCount ++; > + Status =3D EFI_SUCCESS; > } else { > // > // It's not the GeneralLookUp querying. > // Check the Query type, parse the response packet. > // > @@ -1425,30 +1424,36 @@ ParseDnsResponse ( > // > // Allocate new CacheEntry pool. > // > Dns4CacheEntry =3D AllocateZeroPool (sizeof (EFI_DNS4_CACHE_ENTR= Y)); > if (Dns4CacheEntry =3D=3D NULL) { > - Status =3D EFI_UNSUPPORTED; > + Status =3D EFI_OUT_OF_RESOURCES; > goto ON_EXIT; > } > Dns4CacheEntry->HostName =3D AllocateZeroPool (2 * > (StrLen(Dns4TokenEntry->QueryHostName) + 1)); > if (Dns4CacheEntry->HostName =3D=3D NULL) { > - Status =3D EFI_UNSUPPORTED; > + Status =3D EFI_OUT_OF_RESOURCES; > goto ON_EXIT; > } > CopyMem (Dns4CacheEntry->HostName, Dns4TokenEntry->QueryHostName= , > 2 * (StrLen(Dns4TokenEntry->QueryHostName) + 1)); > Dns4CacheEntry->IpAddress =3D AllocateZeroPool (sizeof > (EFI_IPv4_ADDRESS)); > if (Dns4CacheEntry->IpAddress =3D=3D NULL) { > - Status =3D EFI_UNSUPPORTED; > + Status =3D EFI_OUT_OF_RESOURCES; > goto ON_EXIT; > } > CopyMem (Dns4CacheEntry->IpAddress, AnswerData, sizeof > (EFI_IPv4_ADDRESS)); > - Dns4CacheEntry->Timeout =3D AnswerSection->Ttl; > + > + if (CNameTtl !=3D 0 && AnswerSection->Ttl !=3D 0) { > + Dns4CacheEntry->Timeout =3D MIN (CNameTtl, AnswerSection->Ttl)= ; > + } else { > + Dns4CacheEntry->Timeout =3D MAX (CNameTtl, AnswerSection->Ttl)= ; > + } >=20 > UpdateDns4Cache (&mDriverData->Dns4CacheList, FALSE, TRUE, > *Dns4CacheEntry); >=20 > - IpCount ++; > + IpCount ++; > + Status =3D EFI_SUCCESS; > break; > case DNS_TYPE_AAAA: > // > // This is address entry, get Data. > // > @@ -1476,30 +1481,44 @@ ParseDnsResponse ( > // > // Allocate new CacheEntry pool. > // > Dns6CacheEntry =3D AllocateZeroPool (sizeof (EFI_DNS6_CACHE_ENTR= Y)); > if (Dns6CacheEntry =3D=3D NULL) { > - Status =3D EFI_UNSUPPORTED; > + Status =3D EFI_OUT_OF_RESOURCES; > goto ON_EXIT; > } > Dns6CacheEntry->HostName =3D AllocateZeroPool (2 * > (StrLen(Dns6TokenEntry->QueryHostName) + 1)); > if (Dns6CacheEntry->HostName =3D=3D NULL) { > - Status =3D EFI_UNSUPPORTED; > + Status =3D EFI_OUT_OF_RESOURCES; > goto ON_EXIT; > } > CopyMem (Dns6CacheEntry->HostName, Dns6TokenEntry->QueryHostName= , > 2 * (StrLen(Dns6TokenEntry->QueryHostName) + 1)); > Dns6CacheEntry->IpAddress =3D AllocateZeroPool (sizeof > (EFI_IPv6_ADDRESS)); > if (Dns6CacheEntry->IpAddress =3D=3D NULL) { > - Status =3D EFI_UNSUPPORTED; > + Status =3D EFI_OUT_OF_RESOURCES; > goto ON_EXIT; > } > CopyMem (Dns6CacheEntry->IpAddress, AnswerData, sizeof > (EFI_IPv6_ADDRESS)); > - Dns6CacheEntry->Timeout =3D AnswerSection->Ttl; > + > + if (CNameTtl !=3D 0 && AnswerSection->Ttl !=3D 0) { > + Dns6CacheEntry->Timeout =3D MIN (CNameTtl, AnswerSection->Ttl)= ; > + } else { > + Dns6CacheEntry->Timeout =3D MAX (CNameTtl, AnswerSection->Ttl)= ; > + } >=20 > UpdateDns6Cache (&mDriverData->Dns6CacheList, FALSE, TRUE, > *Dns6CacheEntry); >=20 > IpCount ++; > + Status =3D EFI_SUCCESS; > + break; > + case DNS_TYPE_CNAME: > + // > + // According RFC 1034 - 3.6.2, if the query name is an alias, th= e > name server will include the CNAME > + // record in the response and restart the query at the domain > name specified in the data field of the > + // CNAME record. So, just record the TTL value of the CNAME, the= n > skip to parse the next record. > + // > + CNameTtl =3D AnswerSection->Ttl; > break; > default: > Status =3D EFI_UNSUPPORTED; > goto ON_EXIT; > } > @@ -1539,24 +1558,28 @@ ParseDnsResponse ( > } > } > } >=20 > // > - // Parsing is complete, SignalEvent here. > + // Parsing is complete, free the sending packet and signal Event here. > // > + if (Item !=3D NULL && Item->Value !=3D NULL) { > + NetbufFree ((NET_BUF *) (Item->Value)); > + } > + > if (Instance->Service->IpVersion =3D=3D IP_VERSION_4) { > ASSERT (Dns4TokenEntry !=3D NULL); > Dns4RemoveTokenEntry (&Instance->Dns4TxTokens, Dns4TokenEntry); > - Dns4TokenEntry->Token->Status =3D EFI_SUCCESS; > + Dns4TokenEntry->Token->Status =3D Status; > if (Dns4TokenEntry->Token->Event !=3D NULL) { > gBS->SignalEvent (Dns4TokenEntry->Token->Event); > DispatchDpc (); > } > } else { > ASSERT (Dns6TokenEntry !=3D NULL); > Dns6RemoveTokenEntry (&Instance->Dns6TxTokens, Dns6TokenEntry); > - Dns6TokenEntry->Token->Status =3D EFI_SUCCESS; > + Dns6TokenEntry->Token->Status =3D Status; > if (Dns6TokenEntry->Token->Event !=3D NULL) { > gBS->SignalEvent (Dns6TokenEntry->Token->Event); > DispatchDpc (); > } > } > @@ -2035,11 +2058,11 @@ DnsOnTimerUpdate ( > } >=20 > Entry =3D mDriverData->Dns4CacheList.ForwardLink; > while (Entry !=3D &mDriverData->Dns4CacheList) { > Item4 =3D NET_LIST_USER_STRUCT (Entry, DNS4_CACHE, AllCacheLink); > - if (Item4->DnsCache.Timeout<=3D0) { > + if (Item4->DnsCache.Timeout =3D=3D 0) { > RemoveEntryList (&Item4->AllCacheLink); > Entry =3D mDriverData->Dns4CacheList.ForwardLink; > } else { > Entry =3D Entry->ForwardLink; > } > @@ -2054,11 +2077,11 @@ DnsOnTimerUpdate ( > } >=20 > Entry =3D mDriverData->Dns6CacheList.ForwardLink; > while (Entry !=3D &mDriverData->Dns6CacheList) { > Item6 =3D NET_LIST_USER_STRUCT (Entry, DNS6_CACHE, AllCacheLink); > - if (Item6->DnsCache.Timeout<=3D0) { > + if (Item6->DnsCache.Timeout =3D=3D 0) { > RemoveEntryList (&Item6->AllCacheLink); > Entry =3D mDriverData->Dns6CacheList.ForwardLink; > } else { > Entry =3D Entry->ForwardLink; > } > -- > 1.9.5.msysgit.1 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel