uefi-ref/edk2
1
0
Fork 0
mirror of https://github.com/tianocore/edk2 synced 2026-08-27 00:23:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge e92afa6f9e into fb2ac429de

Browse source
This commit is contained in:
Leandro Becker 2026-08-27 07:47:37 +09:00 • committed by GitHub
commit 7850b0c4e5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 52 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

57
NetworkPkg/DnsDxe/DnsImpl.c
View file

@ -1146,6 +1146,7 @@ ParseDnsResponse (
UINT32 RRCount; UINT32 RRCount;
UINT32 AnswerSectionNum; UINT32 AnswerSectionNum;
UINT32 CNameTtl; UINT32 CNameTtl;
UINT32 LabelSize;
EFI_IPv4_ADDRESS *HostAddr4; EFI_IPv4_ADDRESS *HostAddr4;
EFI_IPv6_ADDRESS *HostAddr6; EFI_IPv6_ADDRESS *HostAddr6;
@ -1397,22 +1398,64 @@ ParseDnsResponse (
*Completed = FALSE; *Completed = FALSE;
Status = EFI_ABORTED; Status = EFI_ABORTED;
goto ON_EXIT; goto ON_EXIT;
} else {
RemainingLength -= (sizeof (UINT16) + sizeof (DNS_ANSWER_SECTION));
} }
// //
// Answer name should be PTR, else EFI_UNSUPPORTED returned. // Answer name should be PTR.
// //
if ((*(UINT8 *)AnswerName & 0xC0) != 0xC0) { if ((*(UINT8 *)AnswerName & 0xC0) != 0xC0) {
Status = EFI_UNSUPPORTED; //
goto ON_EXIT; // Some DNS servers may respond with uncompressed domain name.
// Skip the domain labels, the last label is a zero length label.
// (RFC1035 - 4.1.4. Message compression)
//
while (TRUE) {
if (RemainingLength < sizeof (UINT8)) {
*Completed = FALSE;
Status = EFI_ABORTED;
goto ON_EXIT;
}
LabelSize = *(UINT8 *)AnswerName;
AnswerName += sizeof (UINT8);
RemainingLength -= sizeof (UINT8);
if (LabelSize == 0) {
break;
}
// Label size cannot be greater than DNS_MAXIMUM_LABEL_LEN (63),
// because the last two bits (7 and 6) of label size must be zero.
if ((LabelSize > DNS_MAXIMUM_LABEL_LEN) || (RemainingLength < LabelSize)) {
*Completed = FALSE;
Status = EFI_ABORTED;
goto ON_EXIT;
}
// Skip this domain label.
AnswerName += LabelSize;
RemainingLength -= LabelSize;
}
if (RemainingLength < sizeof (DNS_ANSWER_SECTION)) {
*Completed = FALSE;
Status = EFI_ABORTED;
goto ON_EXIT;
}
RemainingLength -= sizeof (DNS_ANSWER_SECTION);
// Get Answer section.
AnswerSection = (DNS_ANSWER_SECTION *)AnswerName;
} else {
RemainingLength -= (sizeof (UINT16) + sizeof (DNS_ANSWER_SECTION));
// Get Answer section.
AnswerSection = (DNS_ANSWER_SECTION *)(AnswerName + sizeof (UINT16));
} }
// //
// Get Answer section. // Convert Answer section endianess.
// //
AnswerSection = (DNS_ANSWER_SECTION *)(AnswerName + sizeof (UINT16));
AnswerSection->Type = NTOHS (AnswerSection->Type); AnswerSection->Type = NTOHS (AnswerSection->Type);
AnswerSection->Class = NTOHS (AnswerSection->Class); AnswerSection->Class = NTOHS (AnswerSection->Class);
AnswerSection->Ttl = NTOHL (AnswerSection->Ttl); AnswerSection->Ttl = NTOHL (AnswerSection->Ttl);

2
NetworkPkg/DnsDxe/DnsImpl.h
View file

@ -82,6 +82,8 @@ extern EFI_DNS6_PROTOCOL mDns6Protocol;
#define DNS_TIME_TO_GETMAP 5 #define DNS_TIME_TO_GETMAP 5
#define DNS_MAXIMUM_LABEL_LEN 63
#pragma pack(1) #pragma pack(1)
typedef union _DNS_FLAGS DNS_FLAGS; typedef union _DNS_FLAGS DNS_FLAGS;