mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-22 01:59:26 +00:00
Code Issues Releases Wiki Activity

Add strict checks on typepair values in the developer's mode

Browse Source 
When in developer's mode, make the DNS_TYPEPAIR_* macros be more
strict on the contents of the 'base' and 'covers', so we can catch
invalid use of the API.
This commit is contained in:
Ondřej Surý 2025-08-07 08:12:36 +02:00
parent 76c027e949
commit 8837491697
No known key found for this signature in database
GPG Key ID: 2820F37E873DEA41
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/dns/include/dns/rdatatype.h
View File

@ -17,13 +17,38 @@
#include <dns/types.h>
#define DNS_TYPEPAIR_TYPE(type) ((dns_rdatatype_t)((type) & 0xFFFF))
#define DNS_TYPEPAIR_COVERS(type) ((dns_rdatatype_t)((type) >> 16))
#define DNS_TYPEPAIR_VALUE(base, ext) \
((dns_typepair_t)(((uint32_t)ext) << 16) | (((uint32_t)base) & 0xffff))
#define DNS_SIGTYPE(type) \
((dns_typepair_t)(((uint32_t)type) << 16) | \
(((uint32_t)dns_rdatatype_rrsig) & 0xffff))
#if DNS_TYPEPAIR_CHECK
#define DNS__TYPEPAIR_CHECK(base, covers) \
INSIST((dns_rdatatype_issig(base) && covers != 0) || \
(base == 0 && covers != 0) || (base != 0 && covers == 0))
#else
#define DNS__TYPEPAIR_CHECK(base, covers)
#endif
#define DNS_TYPEPAIR_TYPE(type) \
({ \
dns_rdatatype_t __base = (dns_rdatatype_t)((type) & 0xFFFF); \
dns_rdatatype_t __covers = (dns_rdatatype_t)((type) >> 16); \
DNS__TYPEPAIR_CHECK(__base, __covers); \
__base; \
})
#define DNS_TYPEPAIR_COVERS(type) \
({ \
dns_rdatatype_t __base = (dns_rdatatype_t)((type) & 0xFFFF); \
dns_rdatatype_t __covers = (dns_rdatatype_t)((type) >> 16); \
DNS__TYPEPAIR_CHECK(__base, __covers); \
__covers; \
})
#define DNS__TYPEPAIR_VALUE(base, covers) \
((dns_typepair_t)(((uint32_t)covers) << 16) | \
(((uint32_t)base) & 0xffff))
#define DNS_TYPEPAIR_VALUE(base, covers) \
({ \
DNS__TYPEPAIR_CHECK(base, covers); \
DNS__TYPEPAIR_VALUE(base, covers); \
})
#define DNS_SIGTYPE(type) DNS__TYPEPAIR_VALUE(dns_rdatatype_rrsig, type)
isc_result_t
dns_rdatatype_fromtext(dns_rdatatype_t *typep, isc_textregion_t *source);

1
meson.build
View File

@ -307,6 +307,7 @@ if developer_mode
config.set('ISC_MUTEX_ERROR_CHECK', 1)
config.set('ISC_SOCKET_DETAILS', 1)
config.set('ISC_STATS_CHECKUNDERFLOW', 1)
config.set('DNS_TYPEPAIR_CHECK', 1)
endif
foreach fn : [