mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-23 10:39:16 +00:00
Code Issues Releases Wiki Activity

[master] check addrlen/scopelen fit within family address length

Browse Source
This commit is contained in:
Evan Hunt 2016-01-05 13:39:44 -08:00
parent 1330ae5fc2
commit 0302fcbf7e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/dns/message.c
View File

@ -3260,11 +3260,15 @@ render_ecs(isc_buffer_t *ecsbuf, isc_buffer_t *target) {
for (i = 0; i < addrbytes; i ++) for (i = 0; i < addrbytes; i ++)
addr[i] = isc_buffer_getuint8(ecsbuf); addr[i] = isc_buffer_getuint8(ecsbuf);
if (family == 1) if (family == 1) {
if (addrlen > 32 || scopelen > 32)
return (DNS_R_OPTERR);
inet_ntop(AF_INET, addr, addr_text, sizeof(addr_text)); inet_ntop(AF_INET, addr, addr_text, sizeof(addr_text));
else if (family == 2) } else if (family == 2) {
if (addrlen > 128 || scopelen > 128)
return (DNS_R_OPTERR);
inet_ntop(AF_INET6, addr, addr_text, sizeof(addr_text)); inet_ntop(AF_INET6, addr, addr_text, sizeof(addr_text));
else { } else {
snprintf(addr_text, sizeof(addr_text), snprintf(addr_text, sizeof(addr_text),
"Unsupported family %u", family); "Unsupported family %u", family);
ADD_STRING(target, addr_text); ADD_STRING(target, addr_text);