Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 10:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash in auth code with odd configuration.

Browse Source
This commit is contained in:
Simon Kelley
2015-04-12 21:52:47 +01:00
parent ad4a8ff7d9
commit 38440b204d
2 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
CHANGELOG
View File

@@ -68,18 +68,31 @@ version 2.73
Fix broken DNSSEC validation of ECDSA signatures. Fix broken DNSSEC validation of ECDSA signatures.
Add --dnssec-timestamp option, which provides an automatic Add --dnssec-timestamp option, which provides an automatic
way to detect when the system time becomes valid after boot way to detect when the system time becomes valid after
on systems without an RTC, whilst allowing DNS queries before the boot on systems without an RTC, whilst allowing DNS
clock is valid so that NTP can run. Thanks to queries before the clock is valid so that NTP can run.
Kevin Darbyshire-Bryant for developing this idea. Thanks to Kevin Darbyshire-Bryant for developing this idea.
Add --tftp-no-fail option. Thanks to Stefan Tomanek for Add --tftp-no-fail option. Thanks to Stefan Tomanek for
the patch. the patch.
Fix crash caused by looking up servers.bind, CHAOS text record, Fix crash caused by looking up servers.bind, CHAOS text
when more than about five --servers= lines are in the dnsmasq record, when more than about five --servers= lines are
config. This causes memory corruption which causes a crash later. in the dnsmasq config. This causes memory corruption
Thanks to Matt Coddington for sterling work chasing this down. which causes a crash later. Thanks to Matt Coddington for
sterling work chasing this down.
Fix crash on receipt of certain malformed DNS requests.
Thanks to Nick Sampanis for spotting the problem.
Fix crash in authoritative DNS code, if a .arpa zone
is declared as authoritative, and then a PTR query which
is not to be treated as authoritative arrived. Normally,
directly declaring .arpa zone as authoritative is not
done, so this crash wouldn't be seen. Instead the
relevant .arpa zone should be specified as a subnet
in the auth-zone declaration. Thanks to Johnny S. Lee
for the bugreport and initial patch.
version 2.72 version 2.72
@@ -125,10 +138,7 @@ version 2.72
Fix problem with --local-service option on big-endian platforms Fix problem with --local-service option on big-endian platforms
Thanks to Richard Genoud for the patch. Thanks to Richard Genoud for the patch.
Fix crash on receipt of certain malformed DNS requests. Thanks
to Nick Sampanis for spotting the problem.
version 2.71 version 2.71
Subtle change to error handling to help DNSSEC validation Subtle change to error handling to help DNSSEC validation
when servers fail to provide NODATA answers for when servers fail to provide NODATA answers for

13
src/auth.c
View File

@@ -141,7 +141,7 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
for (zone = daemon->auth_zones; zone; zone = zone->next) for (zone = daemon->auth_zones; zone; zone = zone->next)
if ((subnet = find_subnet(zone, flag, &addr))) if ((subnet = find_subnet(zone, flag, &addr)))
break; break;
if (!zone) if (!zone)
{ {
auth = 0; auth = 0;
@@ -186,7 +186,7 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
if (intr) if (intr)
{ {
if (in_zone(zone, intr->name, NULL)) if (local_query || in_zone(zone, intr->name, NULL))
{ {
found = 1; found = 1;
log_query(flag | F_REVERSE | F_CONFIG, intr->name, &addr, NULL); log_query(flag | F_REVERSE | F_CONFIG, intr->name, &addr, NULL);
@@ -208,8 +208,11 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
*p = 0; /* must be bare name */ *p = 0; /* must be bare name */
/* add external domain */ /* add external domain */
strcat(name, "."); if (zone)
strcat(name, zone->domain); {
strcat(name, ".");
strcat(name, zone->domain);
}
log_query(flag | F_DHCP | F_REVERSE, name, &addr, record_source(crecp->uid)); log_query(flag | F_DHCP | F_REVERSE, name, &addr, record_source(crecp->uid));
found = 1; found = 1;
if (add_resource_record(header, limit, &trunc, nameoffset, &ansp, if (add_resource_record(header, limit, &trunc, nameoffset, &ansp,
@@ -217,7 +220,7 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
T_PTR, C_IN, "d", name)) T_PTR, C_IN, "d", name))
anscount++; anscount++;
} }
else if (crecp->flags & (F_DHCP | F_HOSTS) && in_zone(zone, name, NULL)) else if (crecp->flags & (F_DHCP | F_HOSTS) && (local_query || in_zone(zone, name, NULL)))
{ {
log_query(crecp->flags & ~F_FORWARD, name, &addr, record_source(crecp->uid)); log_query(crecp->flags & ~F_FORWARD, name, &addr, record_source(crecp->uid));
found = 1; found = 1;