shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-05 06:52:22 +03:00
Code

resolved: fix serialization of LOC records, check correctness

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-07-31 17:42:14 -04:00
parent e90b8642cd
commit afbc4f267b
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/resolve/resolved-dns-packet.c
View File

@ -605,15 +605,15 @@ int dns_packet_append_rr(DnsPacket *p, const DnsResourceRecord *rr, size_t *star
if (r < 0) if (r < 0)
goto fail; goto fail;
r = dns_packet_append_uint16(p, rr->loc.latitude, NULL); r = dns_packet_append_uint32(p, rr->loc.latitude, NULL);
if (r < 0) if (r < 0)
goto fail; goto fail;
r = dns_packet_append_uint16(p, rr->loc.longitude, NULL); r = dns_packet_append_uint32(p, rr->loc.longitude, NULL);
if (r < 0) if (r < 0)
goto fail; goto fail;
r = dns_packet_append_uint16(p, rr->loc.altitude, NULL); r = dns_packet_append_uint32(p, rr->loc.altitude, NULL);
break; break;
case DNS_TYPE_SSHFP: case DNS_TYPE_SSHFP:
@ -930,6 +930,12 @@ fail:
return r; return r;
} }
static bool loc_size_ok(uint8_t size) {
uint8_t m = size >> 4, e = size & 0xF;
return m <= 9 && e <= 9 && (m > 0 || e == 0);
}
int dns_packet_read_rr(DnsPacket *p, DnsResourceRecord **ret, size_t *start) { int dns_packet_read_rr(DnsPacket *p, DnsResourceRecord **ret, size_t *start) {
_cleanup_(dns_resource_record_unrefp) DnsResourceRecord *rr = NULL; _cleanup_(dns_resource_record_unrefp) DnsResourceRecord *rr = NULL;
_cleanup_(dns_resource_key_unrefp) DnsResourceKey *key = NULL; _cleanup_(dns_resource_key_unrefp) DnsResourceKey *key = NULL;
@ -1081,14 +1087,29 @@ int dns_packet_read_rr(DnsPacket *p, DnsResourceRecord **ret, size_t *start) {
if (r < 0) if (r < 0)
goto fail; goto fail;
if (!loc_size_ok(rr->loc.size)) {
r = -EBADMSG;
goto fail;
}
r = dns_packet_read_uint8(p, &rr->loc.horiz_pre, NULL); r = dns_packet_read_uint8(p, &rr->loc.horiz_pre, NULL);
if (r < 0) if (r < 0)
goto fail; goto fail;
if (!loc_size_ok(rr->loc.horiz_pre)) {
r = -EBADMSG;
goto fail;
}
r = dns_packet_read_uint8(p, &rr->loc.vert_pre, NULL); r = dns_packet_read_uint8(p, &rr->loc.vert_pre, NULL);
if (r < 0) if (r < 0)
goto fail; goto fail;
if (!loc_size_ok(rr->loc.vert_pre)) {
r = -EBADMSG;
goto fail;
}
r = dns_packet_read_uint32(p, &rr->loc.latitude, NULL); r = dns_packet_read_uint32(p, &rr->loc.latitude, NULL);
if (r < 0) if (r < 0)
goto fail; goto fail;
@ -1105,7 +1126,7 @@ int dns_packet_read_rr(DnsPacket *p, DnsResourceRecord **ret, size_t *start) {
} else { } else {
dns_packet_rewind(p, pos); dns_packet_rewind(p, pos);
rr->unparseable = true; rr->unparseable = true;
/* fall through */ goto unparseable;
} }
} }
@ -1133,6 +1154,7 @@ int dns_packet_read_rr(DnsPacket *p, DnsResourceRecord **ret, size_t *start) {
break; break;
default: default:
unparseable:
r = dns_packet_read(p, rdlength, &d, NULL); r = dns_packet_read(p, rdlength, &d, NULL);
if (r < 0) if (r < 0)
goto fail; goto fail;