treewide: additional dname checks

diff --git a/daemon/zimport.c b/daemon/zimport.c
index 24f3f3971b7d582fd6e38691dcb9b8230e333e21..6c00dd3ed49f18c496d4809a75ee189ce56e2f47 100644 (file)
--- a/daemon/zimport.c
+++ b/daemon/zimport.c
@@ -473,8 +473,8 @@ static void zi_zone_process(uv_timer_t* handle)
        /* At the moment import of root zone only is supported.
         * Check the name of the parsed zone.
         * TODO - implement importing of arbitrary zone. */
-       char zone_name_str[KNOT_DNAME_MAXLEN];
-       knot_dname_to_str(zone_name_str, z_import->origin, sizeof(zone_name_str));
+       KR_DNAME_GET_STR(zone_name_str, z_import->origin);
+
        if (strcmp(".", zone_name_str) != 0) {
                kr_log_error("[zimport] unexpected zone name `%s` (root zone expected), fail\n",
                             zone_name_str);
@@ -513,9 +513,9 @@ static void zi_zone_process(uv_timer_t* handle)
 
        /* Import DNSKEY at first step. If any validation problems will appear,
         * cancel import of whole zone. */
-       char qname_str[KNOT_DNAME_MAXLEN], type_str[16];
-       knot_dname_to_str(qname_str, rr->owner, sizeof(qname_str));
-       knot_rrtype_to_string(rr->type, type_str, sizeof(type_str));
+       KR_DNAME_GET_STR(qname_str, rr->owner);
+       KR_RRTYPE_GET_STR(type_str, rr->type);
+
        VERBOSE_MSG(NULL, "importing: qname: '%s' type: '%s'\n",
                    qname_str, type_str);
 
@@ -535,8 +535,8 @@ static void zi_zone_process(uv_timer_t* handle)
                        continue;
                }
 
-               knot_dname_to_str(qname_str, rr->owner, sizeof(qname_str));
-               knot_rrtype_to_string(rr->type, type_str, sizeof(type_str));
+               KR_DNAME_GET_STR(qname_str, rr->owner);
+               KR_RRTYPE_GET_STR(type_str, rr->type);
                VERBOSE_MSG(NULL, "importing: qname: '%s' type: '%s'\n",
                            qname_str, type_str);
                int res = zi_rrset_import(z_import, rr);
@@ -567,8 +567,8 @@ static void zi_zone_process(uv_timer_t* handle)
                        continue;
                }
 
-               knot_dname_to_str(qname_str, rr->owner, sizeof(qname_str));
-               knot_rrtype_to_string(rr->type, type_str, sizeof(type_str));
+               KR_DNAME_GET_STR(qname_str, rr->owner);
+               KR_RRTYPE_GET_STR(type_str, rr->type);
                VERBOSE_MSG(NULL, "importing: qname: '%s' type: '%s'\n",
                            qname_str, type_str);
                res = zi_rrset_import(z_import, rr);
@@ -769,8 +769,7 @@ int zi_zone_import(struct zone_import_ctx *z_import,
                } else {
                        /* For now - fail.
                         * TODO - query DS and continue after answer had been obtained. */
-                       char zone_name_str[KNOT_DNAME_MAXLEN];
-                       knot_dname_to_str(zone_name_str, z_import->origin, sizeof(zone_name_str));
+                       KR_DNAME_GET_STR(zone_name_str, z_import->origin);
                        kr_log_error("[zimport] no TA found for `%s`, fail\n", zone_name_str);
                        ret = 1;
                }

diff --git a/lib/defines.h b/lib/defines.h
index 8465531ab6b407f77e0267692163f07d6b81d823..6595588376a651e93b40b80ce4f4bacf05040cec 100644 (file)
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -75,6 +75,9 @@ static inline int KR_COLD kr_error(int x) {
 #define KR_CACHE_DEFAULT_TTL_MIN (5) /* avoid bursts of queries */
 #define KR_CACHE_DEFAULT_TTL_MAX (6 * 24 * 3600) /* 6 days, like the root NS TTL */
 
+#define KR_DNAME_STR_MAXLEN (KNOT_DNAME_TXT_MAXLEN + 1)
+#define KR_RRTYPE_STR_MAXLEN (16 + 1)
+
 /*
  * Address sanitizer hints.
  */

diff --git a/lib/layer/iterate.c b/lib/layer/iterate.c
index 3e0e1acde4cc16e1020e7e5d919d8bfd292b2a6a..d5a65779163dc99185714dac0527733b1708cad7 100644 (file)
--- a/lib/layer/iterate.c
+++ b/lib/layer/iterate.c
@@ -160,12 +160,13 @@ static int update_nsaddr(const knot_rrset_t *rr, struct kr_query *query, int *gl
                const knot_rdata_t *rdata = rr->rrs.data;
                const void *addr = knot_rdata_data(rdata);
                const int addr_len = knot_rdata_rdlen(rdata);
-               char name_str[KNOT_DNAME_MAXLEN];
+               char name_str[KR_DNAME_STR_MAXLEN];
                char addr_str[INET6_ADDRSTRLEN];
                WITH_VERBOSE(query) {
                        const int af = (addr_len == sizeof(struct in_addr)) ?
                                       AF_INET : AF_INET6;
                        knot_dname_to_str(name_str, rr->owner, sizeof(name_str));
+                       name_str[sizeof(name_str) - 1] = 0;
                        inet_ntop(af, addr, addr_str, sizeof(addr_str));
                }
                if (!(query->flags.ALLOW_LOCAL) &&
@@ -878,9 +879,8 @@ int kr_make_query(struct kr_query *query, knot_pkt_t *pkt)
        knot_wire_set_id(pkt->wire, query->id);
        pkt->parsed = pkt->size;
        WITH_VERBOSE(query) {
-               char name_str[KNOT_DNAME_MAXLEN], type_str[16];
-               knot_dname_to_str(name_str, query->sname, sizeof(name_str));
-               knot_rrtype_to_string(query->stype, type_str, sizeof(type_str));
+               KR_DNAME_GET_STR(name_str, query->sname);
+               KR_RRTYPE_GET_STR(type_str, query->stype);
                QVERBOSE_MSG(query, "'%s' type '%s' id was assigned, parent id %u\n",
                            name_str, type_str, query->parent ? query->parent->id : 0);
        }

diff --git a/lib/resolve.c b/lib/resolve.c
index a1f7122e0ea717402591c07821ae97efa74c2694..1196fa333bd4a0098cf9504ffd30d2e19b263daf 100644 (file)
--- a/lib/resolve.c
+++ b/lib/resolve.c
@@ -1140,8 +1140,7 @@ static int forward_trust_chain_check(struct kr_request *request, struct kr_query
                qry->flags.DNSSEC_WANT = true;
                want_secured = true;
                WITH_VERBOSE(qry) {
-               char qname_str[KNOT_DNAME_MAXLEN];
-               knot_dname_to_str(qname_str, wanted_name, sizeof(qname_str));
+               KR_DNAME_GET_STR(qname_str, wanted_name);
                VERBOSE_MSG(qry, ">< TA: '%s'\n", qname_str);
                }
        }
@@ -1219,8 +1218,7 @@ static int trust_chain_check(struct kr_request *request, struct kr_query *qry)
                        qry->zone_cut.trust_anchor = knot_rrset_copy(ta_rr, qry->zone_cut.pool);
 
                        WITH_VERBOSE(qry) {
-                       char qname_str[KNOT_DNAME_MAXLEN];
-                       knot_dname_to_str(qname_str, ta_rr->owner, sizeof(qname_str));
+                       KR_DNAME_GET_STR(qname_str, ta_rr->owner);
                        VERBOSE_MSG(qry, ">< TA: '%s'\n", qname_str);
                        }
                }
@@ -1558,10 +1556,13 @@ int kr_resolve_checkout(struct kr_request *request, struct sockaddr *src,
        }
 
        WITH_VERBOSE(qry) {
-       char qname_str[KNOT_DNAME_MAXLEN], zonecut_str[KNOT_DNAME_MAXLEN], ns_str[INET6_ADDRSTRLEN], type_str[16];
-       knot_dname_to_str(qname_str, knot_pkt_qname(packet), sizeof(qname_str));
-       knot_dname_to_str(zonecut_str, qry->zone_cut.name, sizeof(zonecut_str));
-       knot_rrtype_to_string(knot_pkt_qtype(packet), type_str, sizeof(type_str));
+
+       char ns_str[INET6_ADDRSTRLEN];
+
+       KR_DNAME_GET_STR(qname_str, knot_pkt_qname(packet));
+       KR_DNAME_GET_STR(zonecut_str, qry->zone_cut.name);
+       KR_RRTYPE_GET_STR(type_str, knot_pkt_qtype(packet));
+
        for (size_t i = 0; i < KR_NSREP_MAXADDR; ++i) {
                struct sockaddr *addr = &qry->ns.addr[i].ip;
                if (addr->sa_family == AF_UNSPEC) {

diff --git a/lib/rplan.c b/lib/rplan.c
index e18d96a13aa9204277ac9376c345160300e6cb66..eb923589fad34ff35bb536b443b3a64fde067126 100644 (file)
--- a/lib/rplan.c
+++ b/lib/rplan.c
@@ -230,9 +230,8 @@ struct kr_query *kr_rplan_push(struct kr_rplan *rplan, struct kr_query *parent,
        qry->stype = type;
 
        WITH_VERBOSE(qry) {
-       char name_str[KNOT_DNAME_MAXLEN], type_str[16];
-       knot_dname_to_str(name_str, name, sizeof(name_str));
-       knot_rrtype_to_string(type, type_str, sizeof(type_str));
+       KR_DNAME_GET_STR(name_str, name);
+       KR_RRTYPE_GET_STR(type_str, type);
        VERBOSE_MSG(parent, "plan '%s' type '%s'\n", name_str, type_str);
        }
        return qry;

diff --git a/lib/utils.c b/lib/utils.c
index c52befb47af1ffaa6c2964c04bef7b854e462bcd..16218a8631bb1650747fba838677fe8117a375e0 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -882,9 +882,7 @@ char *kr_pkt_text(const knot_pkt_t *pkt)
        static const char * snames[] = {
                ";; ANSWER SECTION", ";; AUTHORITY SECTION", ";; ADDITIONAL SECTION"
        };
-       char rrtype[32];
        char flags[32];
-       char qname[KNOT_DNAME_MAXLEN];
        uint8_t pkt_rcode = knot_wire_get_rcode(pkt->wire);
        uint8_t pkt_opcode = knot_wire_get_opcode(pkt->wire);
        const char *rcode_str = "Unknown";
@@ -918,8 +916,8 @@ char *kr_pkt_text(const knot_pkt_t *pkt)
        }
 
        if (qdcount == 1) {
-               knot_dname_to_str(qname, knot_pkt_qname(pkt), KNOT_DNAME_MAXLEN);
-               knot_rrtype_to_string(knot_pkt_qtype(pkt), rrtype, sizeof(rrtype));
+               KR_DNAME_GET_STR(qname, knot_pkt_qname(pkt));
+               KR_RRTYPE_GET_STR(rrtype, knot_pkt_qtype(pkt));
                ptr = mp_printf_append(mp, ptr, ";; QUESTION SECTION\n%s\t\t%s\n", qname, rrtype);
        } else if (qdcount > 1) {
                ptr = mp_printf_append(mp, ptr, ";; Warning: unsupported QDCOUNT %hu\n", qdcount);

diff --git a/lib/utils.h b/lib/utils.h
index dfdb6912de559a727c373dad3be543e333c5af3d..e33b6cd6dec37ebbd82ea0db8f055c24d6bc07cb 100644 (file)
--- a/lib/utils.h
+++ b/lib/utils.h
@@ -83,6 +83,15 @@ bool kr_log_trace(const struct kr_query *query, const char *source, const char *
 #define WITH_VERBOSE(query) if(__builtin_expect(kr_verbose_status || kr_log_trace_enabled(query), false))
 #define kr_log_verbose if(VERBOSE_STATUS) kr_log_verbose
 
+#define KR_DNAME_GET_STR(dname_str, dname) \
+       char dname_str[KR_DNAME_STR_MAXLEN]; \
+       knot_dname_to_str(dname_str, (dname), sizeof(dname_str)); \
+       dname_str[sizeof(dname_str) - 1] = 0;
+
+#define KR_RRTYPE_GET_STR(rrtype_str, rrtype) \
+       char rrtype_str[KR_RRTYPE_STR_MAXLEN]; \
+       knot_rrtype_to_string((rrtype), rrtype_str, sizeof(rrtype_str)); \
+       rrtype_str[sizeof(rrtype_str) - 1] = 0;
 
 /* C11 compatibility, but without any implementation so far. */
 #ifndef static_assert

diff --git a/modules/hints/hints.c b/modules/hints/hints.c
index c7eb28ee365b13e2b2a53115909976da58db5f11..457729d84f174c0a934b81a96dc33f683dcbdf59 100644 (file)
--- a/modules/hints/hints.c
+++ b/modules/hints/hints.c
@@ -512,11 +512,7 @@ static char* pack_hints(struct kr_zonecut *hints) {
        JsonNode *root_node = json_mkobject();
        trie_it_t *it;
        for (it = trie_it_begin(hints->nsset); !trie_it_finished(it); trie_it_next(it)) {
-               char nsname_str[KNOT_DNAME_MAXLEN] = {'\0'};
-               knot_dname_to_str(nsname_str,
-                                       /* here we trust that it's a correct dname */
-                                       (const knot_dname_t *)trie_it_key(it, NULL),
-                                       sizeof(nsname_str));
+               KR_DNAME_GET_STR(nsname_str, (const knot_dname_t *)trie_it_key(it, NULL));
                JsonNode *addr_list = pack_addrs((pack_t *)*trie_it_val(it));
                if (!addr_list) goto error;
                json_append_member(root_node, nsname_str, addr_list);

diff --git a/modules/stats/stats.c b/modules/stats/stats.c
index 7fd48edfda974a0a6cb5cf4030a84aee236cec33..0b1dd4c43327bf0ead215b2440a4245a1b0d49ef 100644 (file)
--- a/modules/stats/stats.c
+++ b/modules/stats/stats.c
@@ -326,11 +326,11 @@ static char* stats_list(void *env, struct kr_module *module, const char *args)
 static enum lru_apply_do dump_value(const char *key, uint len, unsigned *val, void *baton)
 {
        uint16_t key_type = 0;
-       char key_name[KNOT_DNAME_MAXLEN], type_str[16];
        /* Extract query name, type and counter */
        memcpy(&key_type, key, sizeof(key_type));
-       knot_dname_to_str(key_name, (uint8_t *)key + sizeof(key_type), sizeof(key_name));
-       knot_rrtype_to_string(key_type, type_str, sizeof(type_str));
+       KR_DNAME_GET_STR(key_name, (uint8_t *)key + sizeof(key_type));
+       KR_RRTYPE_GET_STR(type_str, key_type);
+
        /* Convert to JSON object */
        JsonNode *json_val = json_mkobject();
        json_append_member(json_val, "count", json_mknumber(*val));