X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fresolve%2Fresolved-dns-packet.c;h=1ff56875e64fd10f9c9e185fedb126f77bac38b8;hp=02532dc7212153143b907a3ac4acce3fdc81537b;hb=623a4c97b9175f95c4b1c6fc34e36c56f1e4ddbf;hpb=1716f6dcf54d4c181c2e2558e3d5414f54c8d9ca diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c index 02532dc72..1ff56875e 100644 --- a/src/resolve/resolved-dns-packet.c +++ b/src/resolve/resolved-dns-packet.c @@ -96,14 +96,14 @@ static void dns_packet_free(DnsPacket *p) { assert(p); - if (p->rrs) - dns_resource_record_freev(p->rrs, DNS_PACKET_RRCOUNT(p)); + dns_question_unref(p->question); + dns_answer_unref(p->answer); while ((s = hashmap_steal_first_key(p->names))) free(s); hashmap_free(p->names); - free(p->data); + free(p->_data); free(p); } @@ -130,7 +130,7 @@ int dns_packet_validate(DnsPacket *p) { if (p->size > DNS_PACKET_SIZE_MAX) return -EBADMSG; - return 0; + return 1; } int dns_packet_validate_reply(DnsPacket *p) { @@ -142,13 +142,44 @@ int dns_packet_validate_reply(DnsPacket *p) { if (r < 0) return r; - if (DNS_PACKET_QR(p) == 0) + if (DNS_PACKET_QR(p) != 1) + return 0; + + if (DNS_PACKET_OPCODE(p) != 0) return -EBADMSG; + return 1; +} + +int dns_packet_validate_query(DnsPacket *p) { + int r; + + assert(p); + + r = dns_packet_validate(p); + if (r < 0) + return r; + + if (DNS_PACKET_QR(p) != 0) + return 0; + if (DNS_PACKET_OPCODE(p) != 0) return -EBADMSG; - return 0; + if (DNS_PACKET_TC(p)) + return -EBADMSG; + + if (p->protocol == DNS_PROTOCOL_LLMNR && + DNS_PACKET_QDCOUNT(p) != 1) + return -EBADMSG; + + if (DNS_PACKET_ANCOUNT(p) > 0) + return -EBADMSG; + + if (DNS_PACKET_NSCOUNT(p) > 0) + return -EBADMSG; + + return 1; } static int dns_packet_extend(DnsPacket *p, size_t add, void **ret, size_t *start) { @@ -164,21 +195,21 @@ static int dns_packet_extend(DnsPacket *p, size_t add, void **ret, size_t *start if (p->size + add > a) return -EMSGSIZE; - if (p->data) { + if (p->_data) { void *d; - d = realloc(p->data, a); + d = realloc(p->_data, a); if (!d) return -ENOMEM; - p->data = d; + p->_data = d; } else { - p->data = malloc(a); - if (!p->data) + p->_data = malloc(a); + if (!p->_data) return -ENOMEM; - memcpy(p->data, (uint8_t*) p + ALIGN(sizeof(DnsPacket)), p->size); - memzero((uint8_t*) p->data + p->size, a - p->size); + memcpy(p->_data, (uint8_t*) p + ALIGN(sizeof(DnsPacket)), p->size); + memzero((uint8_t*) p->_data + p->size, a - p->size); } p->allocated = a; @@ -216,6 +247,20 @@ static void dns_packet_truncate(DnsPacket *p, size_t sz) { p->size = sz; } +int dns_packet_append_blob(DnsPacket *p, const void *d, size_t l, size_t *start) { + void *q; + int r; + + assert(p); + + r = dns_packet_extend(p, l, &q, start); + if (r < 0) + return r; + + memcpy(q, d, l); + return 0; +} + int dns_packet_append_uint8(DnsPacket *p, uint8_t v, size_t *start) { void *d; int r; @@ -242,7 +287,25 @@ int dns_packet_append_uint16(DnsPacket *p, uint16_t v, size_t *start) { return r; ((uint8_t*) d)[0] = (uint8_t) (v >> 8); - ((uint8_t*) d)[1] = (uint8_t) (v & 255); + ((uint8_t*) d)[1] = (uint8_t) v; + + return 0; +} + +int dns_packet_append_uint32(DnsPacket *p, uint32_t v, size_t *start) { + void *d; + int r; + + assert(p); + + r = dns_packet_extend(p, sizeof(uint32_t), &d, start); + if (r < 0) + return r; + + ((uint8_t*) d)[0] = (uint8_t) (v >> 24); + ((uint8_t*) d)[1] = (uint8_t) (v >> 16); + ((uint8_t*) d)[2] = (uint8_t) (v >> 8); + ((uint8_t*) d)[3] = (uint8_t) v; return 0; } @@ -365,7 +428,7 @@ int dns_packet_append_key(DnsPacket *p, const DnsResourceKey *k, size_t *start) saved_size = p->size; - r = dns_packet_append_name(p, k->name, NULL); + r = dns_packet_append_name(p, DNS_RESOURCE_KEY_NAME(k), NULL); if (r < 0) goto fail; @@ -387,6 +450,114 @@ fail: return r; } +int dns_packet_append_rr(DnsPacket *p, const DnsResourceRecord *rr, size_t *start) { + size_t saved_size, rdlength_offset, end, rdlength; + int r; + + assert(p); + assert(rr); + + saved_size = p->size; + + r = dns_packet_append_key(p, rr->key, NULL); + if (r < 0) + goto fail; + + r = dns_packet_append_uint32(p, rr->ttl, NULL); + if (r < 0) + goto fail; + + /* Initially we write 0 here */ + r = dns_packet_append_uint16(p, 0, &rdlength_offset); + if (r < 0) + goto fail; + + switch (rr->key->type) { + + case DNS_TYPE_PTR: + case DNS_TYPE_NS: + case DNS_TYPE_CNAME: + r = dns_packet_append_name(p, rr->ptr.name, NULL); + break; + + case DNS_TYPE_HINFO: + r = dns_packet_append_string(p, rr->hinfo.cpu, NULL); + if (r < 0) + goto fail; + + r = dns_packet_append_string(p, rr->hinfo.os, NULL); + break; + + case DNS_TYPE_A: + r = dns_packet_append_blob(p, &rr->a.in_addr, sizeof(struct in_addr), NULL); + break; + + case DNS_TYPE_AAAA: + r = dns_packet_append_blob(p, &rr->aaaa.in6_addr, sizeof(struct in6_addr), NULL); + break; + + case DNS_TYPE_SOA: + r = dns_packet_append_name(p, rr->soa.mname, NULL); + if (r < 0) + goto fail; + + r = dns_packet_append_name(p, rr->soa.rname, NULL); + if (r < 0) + goto fail; + + r = dns_packet_append_uint32(p, rr->soa.serial, NULL); + if (r < 0) + goto fail; + + r = dns_packet_append_uint32(p, rr->soa.refresh, NULL); + if (r < 0) + goto fail; + + r = dns_packet_append_uint32(p, rr->soa.retry, NULL); + if (r < 0) + goto fail; + + r = dns_packet_append_uint32(p, rr->soa.expire, NULL); + if (r < 0) + goto fail; + + r = dns_packet_append_uint32(p, rr->soa.minimum, NULL); + break; + + case DNS_TYPE_MX: + case DNS_TYPE_TXT: + case DNS_TYPE_SRV: + case DNS_TYPE_DNAME: + case DNS_TYPE_SSHFP: + default: + r = dns_packet_append_blob(p, rr->generic.data, rr->generic.size, NULL); + break; + } + if (r < 0) + goto fail; + + /* Let's calculate the actual data size and update the field */ + rdlength = p->size - rdlength_offset - sizeof(uint16_t); + if (rdlength > 0xFFFF) { + r = ENOSPC; + goto fail; + } + + end = p->size; + p->size = rdlength_offset; + r = dns_packet_append_uint16(p, rdlength, NULL); + if (r < 0) + goto fail; + p->size = end; + + return 0; + +fail: + dns_packet_truncate(p, saved_size); + return r; +} + + int dns_packet_read(DnsPacket *p, size_t sz, const void **ret, size_t *start) { assert(p); @@ -411,6 +582,21 @@ void dns_packet_rewind(DnsPacket *p, size_t idx) { p->rindex = idx; } +int dns_packet_read_blob(DnsPacket *p, void *d, size_t sz, size_t *start) { + const void *q; + int r; + + assert(p); + assert(d); + + r = dns_packet_read(p, sz, &q, start); + if (r < 0) + return r; + + memcpy(d, q, sz); + return 0; +} + int dns_packet_read_uint8(DnsPacket *p, uint8_t *ret, size_t *start) { const void *d; int r; @@ -599,8 +785,10 @@ fail: return r; } -int dns_packet_read_key(DnsPacket *p, DnsResourceKey *ret, size_t *start) { - _cleanup_(dns_resource_key_free) DnsResourceKey k = {}; +int dns_packet_read_key(DnsPacket *p, DnsResourceKey **ret, size_t *start) { + _cleanup_free_ char *name = NULL; + uint16_t class, type; + DnsResourceKey *key; size_t saved_rindex; int r; @@ -609,20 +797,26 @@ int dns_packet_read_key(DnsPacket *p, DnsResourceKey *ret, size_t *start) { saved_rindex = p->rindex; - r = dns_packet_read_name(p, &k.name, NULL); + r = dns_packet_read_name(p, &name, NULL); if (r < 0) goto fail; - r = dns_packet_read_uint16(p, &k.type, NULL); + r = dns_packet_read_uint16(p, &type, NULL); if (r < 0) goto fail; - r = dns_packet_read_uint16(p, &k.class, NULL); + r = dns_packet_read_uint16(p, &class, NULL); if (r < 0) goto fail; - *ret = k; - zero(k); + key = dns_resource_key_new_consume(class, type, name); + if (!key) { + r = -ENOMEM; + goto fail; + } + + name = NULL; + *ret = key; if (start) *start = saved_rindex; @@ -634,7 +828,8 @@ fail: } int dns_packet_read_rr(DnsPacket *p, DnsResourceRecord **ret, size_t *start) { - _cleanup_(dns_resource_record_unrefp) DnsResourceRecord *rr; + _cleanup_(dns_resource_record_unrefp) DnsResourceRecord *rr = NULL; + _cleanup_(dns_resource_key_unrefp) DnsResourceKey *key = NULL; size_t saved_rindex, offset; uint16_t rdlength; const void *d; @@ -643,16 +838,18 @@ int dns_packet_read_rr(DnsPacket *p, DnsResourceRecord **ret, size_t *start) { assert(p); assert(ret); - rr = dns_resource_record_new(); - if (!rr) - return -ENOMEM; - saved_rindex = p->rindex; - r = dns_packet_read_key(p, &rr->key, NULL); + r = dns_packet_read_key(p, &key, NULL); if (r < 0) goto fail; + rr = dns_resource_record_new(key); + if (!rr) { + r = -ENOMEM; + goto fail; + } + r = dns_packet_read_uint32(p, &rr->ttl, NULL); if (r < 0) goto fail; @@ -668,7 +865,7 @@ int dns_packet_read_rr(DnsPacket *p, DnsResourceRecord **ret, size_t *start) { offset = p->rindex; - switch (rr->key.type) { + switch (rr->key->type) { case DNS_TYPE_PTR: case DNS_TYPE_NS: @@ -685,21 +882,46 @@ int dns_packet_read_rr(DnsPacket *p, DnsResourceRecord **ret, size_t *start) { break; case DNS_TYPE_A: - r = dns_packet_read(p, sizeof(struct in_addr), &d, NULL); + r = dns_packet_read_blob(p, &rr->a.in_addr, sizeof(struct in_addr), NULL); + break; + + case DNS_TYPE_AAAA: + r = dns_packet_read_blob(p, &rr->aaaa.in6_addr, sizeof(struct in6_addr), NULL); + break; + + case DNS_TYPE_SOA: + r = dns_packet_read_name(p, &rr->soa.mname, NULL); if (r < 0) goto fail; - memcpy(&rr->a.in_addr, d, sizeof(struct in_addr)); - break; + r = dns_packet_read_name(p, &rr->soa.rname, NULL); + if (r < 0) + goto fail; - case DNS_TYPE_AAAA: - r = dns_packet_read(p, sizeof(struct in6_addr), &d, NULL); + r = dns_packet_read_uint32(p, &rr->soa.serial, NULL); + if (r < 0) + goto fail; + + r = dns_packet_read_uint32(p, &rr->soa.refresh, NULL); + if (r < 0) + goto fail; + + r = dns_packet_read_uint32(p, &rr->soa.retry, NULL); if (r < 0) goto fail; - memcpy(&rr->aaaa.in6_addr, d, sizeof(struct in6_addr)); + r = dns_packet_read_uint32(p, &rr->soa.expire, NULL); + if (r < 0) + goto fail; + + r = dns_packet_read_uint32(p, &rr->soa.minimum, NULL); break; + case DNS_TYPE_MX: + case DNS_TYPE_TXT: + case DNS_TYPE_SRV: + case DNS_TYPE_DNAME: + case DNS_TYPE_SSHFP: default: r = dns_packet_read(p, rdlength, &d, NULL); if (r < 0) @@ -733,63 +955,65 @@ fail: return r; } -int dns_packet_skip_question(DnsPacket *p) { - unsigned i, n; +int dns_packet_extract(DnsPacket *p) { + _cleanup_(dns_question_unrefp) DnsQuestion *question = NULL; + _cleanup_(dns_answer_unrefp) DnsAnswer *answer = NULL; + size_t saved_rindex; + unsigned n, i; int r; - assert(p); - + saved_rindex = p->rindex; dns_packet_rewind(p, DNS_PACKET_HEADER_SIZE); n = DNS_PACKET_QDCOUNT(p); - for (i = 0; i < n; i++) { - _cleanup_(dns_resource_key_free) DnsResourceKey key = {}; + if (n > 0) { + question = dns_question_new(n); + if (!question) { + r = -ENOMEM; + goto finish; + } - r = dns_packet_read_key(p, &key, NULL); - if (r < 0) - return r; - } + for (i = 0; i < n; i++) { + _cleanup_(dns_resource_key_unrefp) DnsResourceKey *key = NULL; - return 0; -} + r = dns_packet_read_key(p, &key, NULL); + if (r < 0) + goto finish; -int dns_packet_extract_rrs(DnsPacket *p) { - DnsResourceRecord **rrs = NULL; - size_t saved_rindex; - unsigned n, added = 0; - int r; + r = dns_question_add(question, key); + if (r < 0) + goto finish; + } + } - if (p->rrs) - return (int) DNS_PACKET_RRCOUNT(p); + n = DNS_PACKET_RRCOUNT(p); + if (n > 0) { + answer = dns_answer_new(n); + if (!answer) { + r = -ENOMEM; + goto finish; + } - saved_rindex = p->rindex; + for (i = 0; i < n; i++) { + _cleanup_(dns_resource_record_unrefp) DnsResourceRecord *rr = NULL; - r = dns_packet_skip_question(p); - if (r < 0) - goto finish; + r = dns_packet_read_rr(p, &rr, NULL); + if (r < 0) + goto finish; - n = DNS_PACKET_RRCOUNT(p); - if (n <= 0) { - r = 0; - goto finish; + r = dns_answer_add(answer, rr); + if (r < 0) + goto finish; + } } - rrs = new0(DnsResourceRecord*, n); - if (!rrs) { - r = -ENOMEM; - goto finish; - } + p->question = question; + question = NULL; - for (added = 0; added < n; added++) { - r = dns_packet_read_rr(p, &rrs[added], NULL); - if (r < 0) { - dns_resource_record_freev(rrs, added); - goto finish; - } - } + p->answer = answer; + answer = NULL; - p->rrs = rrs; - r = (int) n; + r = 0; finish: p->rindex = saved_rindex;