chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resolved: remove unused variables
[elogind.git]
/
src
/
resolve
/
resolved-dns-packet.c
diff --git
a/src/resolve/resolved-dns-packet.c
b/src/resolve/resolved-dns-packet.c
index 3eda803144df6337a8e9b42b5d8d01691a4024c4..ba056f1f444441000c65a77d3c9bc217bfbcdb52 100644
(file)
--- a/
src/resolve/resolved-dns-packet.c
+++ b/
src/resolve/resolved-dns-packet.c
@@
-390,6
+390,7
@@
int dns_packet_append_name(DnsPacket *p, const char *name, size_t *start) {
_cleanup_free_ char *s = NULL;
char label[DNS_LABEL_MAX];
size_t n;
_cleanup_free_ char *s = NULL;
char label[DNS_LABEL_MAX];
size_t n;
+ int k;
n = PTR_TO_SIZE(hashmap_get(p->names, name));
if (n > 0) {
n = PTR_TO_SIZE(hashmap_get(p->names, name));
if (n > 0) {
@@
-414,6
+415,17
@@
int dns_packet_append_name(DnsPacket *p, const char *name, size_t *start) {
if (r < 0)
goto fail;
if (r < 0)
goto fail;
+ if (p->protocol == DNS_PROTOCOL_DNS)
+ k = dns_label_apply_idna(label, r, label, sizeof(label));
+ else
+ k = dns_label_undo_idna(label, r, label, sizeof(label));
+ if (k < 0) {
+ r = k;
+ goto fail;
+ }
+ if (k > 0)
+ r = k;
+
r = dns_packet_append_label(p, label, r, &n);
if (r < 0)
goto fail;
r = dns_packet_append_label(p, label, r, &n);
if (r < 0)
goto fail;
@@
-605,15
+617,15
@@
int dns_packet_append_rr(DnsPacket *p, const DnsResourceRecord *rr, size_t *star
if (r < 0)
goto fail;
if (r < 0)
goto fail;
- r = dns_packet_append_uint
16
(p, rr->loc.latitude, NULL);
+ r = dns_packet_append_uint
32
(p, rr->loc.latitude, NULL);
if (r < 0)
goto fail;
if (r < 0)
goto fail;
- r = dns_packet_append_uint
16
(p, rr->loc.longitude, NULL);
+ r = dns_packet_append_uint
32
(p, rr->loc.longitude, NULL);
if (r < 0)
goto fail;
if (r < 0)
goto fail;
- r = dns_packet_append_uint
16
(p, rr->loc.altitude, NULL);
+ r = dns_packet_append_uint
32
(p, rr->loc.altitude, NULL);
break;
case DNS_TYPE_SSHFP:
break;
case DNS_TYPE_SSHFP:
@@
-840,7
+852,7
@@
int dns_packet_read_name(DnsPacket *p, char **_ret, size_t *start) {
else
first = false;
else
first = false;
- memcpy(ret + n, t,
c
);
+ memcpy(ret + n, t,
r
);
n += r;
continue;
} else if ((c & 0xc0) == 0xc0) {
n += r;
continue;
} else if ((c & 0xc0) == 0xc0) {
@@
-930,6
+942,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) {
_cleanup_(dns_resource_record_unrefp) DnsResourceRecord *rr = NULL;
_cleanup_(dns_resource_key_unrefp) DnsResourceKey *key = NULL;
int dns_packet_read_rr(DnsPacket *p, DnsResourceRecord **ret, size_t *start) {
_cleanup_(dns_resource_record_unrefp) DnsResourceRecord *rr = NULL;
_cleanup_(dns_resource_key_unrefp) DnsResourceKey *key = NULL;
@@
-1081,14
+1099,29
@@
int dns_packet_read_rr(DnsPacket *p, DnsResourceRecord **ret, size_t *start) {
if (r < 0)
goto fail;
if (r < 0)
goto fail;
+ if (!loc_size_ok(rr->loc.size)) {
+ r = -EBADMSG;
+ goto fail;
+ }
+
r = dns_packet_read_uint8(p, &rr->loc.horiz_pre, NULL);
if (r < 0)
goto fail;
r = dns_packet_read_uint8(p, &rr->loc.horiz_pre, NULL);
if (r < 0)
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);
if (r < 0)
goto fail;
r = dns_packet_read_uint8(p, &rr->loc.vert_pre, NULL);
if (r < 0)
goto fail;
+ if (!loc_size_ok(rr->loc.vert_pre)) {
+ r = -EBADMSG;
+ goto fail;
+ }
+
r = dns_packet_read_uint32(p, &rr->loc.latitude, NULL);
if (r < 0)
goto fail;
r = dns_packet_read_uint32(p, &rr->loc.latitude, NULL);
if (r < 0)
goto fail;
@@
-1105,7
+1138,7
@@
int dns_packet_read_rr(DnsPacket *p, DnsResourceRecord **ret, size_t *start) {
} else {
dns_packet_rewind(p, pos);
rr->unparseable = true;
} else {
dns_packet_rewind(p, pos);
rr->unparseable = true;
- /* fall through */
+ goto unparseable;
}
}
}
}
@@
-1133,6
+1166,7
@@
int dns_packet_read_rr(DnsPacket *p, DnsResourceRecord **ret, size_t *start) {
break;
default:
break;
default:
+ unparseable:
r = dns_packet_read(p, rdlength, &d, NULL);
if (r < 0)
goto fail;
r = dns_packet_read(p, rdlength, &d, NULL);
if (r < 0)
goto fail;