124 lines
4.3 KiB
Diff
124 lines
4.3 KiB
Diff
From dfcadc2085c8844b5836aff2b5ea51fb60c34868 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
|
|
Date: Wed, 29 May 2024 08:43:39 +0200
|
|
Subject: [PATCH 2/3] Add a limit to the number of RR types for single name
|
|
|
|
Previously, the number of RR types for a single owner name was limited
|
|
only by the maximum number of the types (64k). As the data structure
|
|
that holds the RR types for the database node is just a linked list, and
|
|
there are places where we just walk through the whole list (again and
|
|
again), adding a large number of RR types for a single owner named with
|
|
would slow down processing of such name (database node).
|
|
|
|
Add a hard-coded limit (100) to cap the number of the RR types for a single
|
|
owner. The limit can be changed at the compile time by adding following
|
|
define to CFLAGS:
|
|
|
|
-DDNS_RBTDB_MAX_RTYPES=<limit>
|
|
|
|
Conflict:Context Adaptation
|
|
Reference:https://gitlab.isc.org/isc-projects/bind9/-/commit/5360c90612abf51deb4a80b30e1da84fd61212a5
|
|
|
|
---
|
|
configure | 2 +-
|
|
configure.ac | 2 +-
|
|
lib/dns/rbtdb.c | 17 +++++++++++++++++
|
|
3 files changed, 19 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index bdfd59f..be0f60e 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -12295,7 +12295,7 @@ fi
|
|
|
|
XTARGETS=
|
|
if test "$enable_developer" = "yes"; then :
|
|
- STD_CDEFINES="$STD_CDEFINES -DISC_MEM_DEFAULTFILL=1 -DISC_LIST_CHECKINIT=1 -DDNS_RDATASET_MAX_RECORDS=5000"
|
|
+ STD_CDEFINES="$STD_CDEFINES -DISC_MEM_DEFAULTFILL=1 -DISC_LIST_CHECKINIT=1 -DDNS_RDATASET_MAX_RECORDS=5000 -DDNS_RBTDB_MAX_RTYPES=5000"
|
|
test "${enable_fixed_rrset+set}" = set || enable_fixed_rrset=yes
|
|
test "${enable_querytrace+set}" = set || enable_querytrace=yes
|
|
test "${with_cmocka+set}" = set || with_cmocka=yes
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 5be8c76..92b0234 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -94,7 +94,7 @@ AC_ARG_ENABLE([developer],
|
|
|
|
XTARGETS=
|
|
AS_IF([test "$enable_developer" = "yes"],
|
|
- [STD_CDEFINES="$STD_CDEFINES -DISC_MEM_DEFAULTFILL=1 -DISC_LIST_CHECKINIT=1 -DDNS_RDATASET_MAX_RECORDS=5000"
|
|
+ [STD_CDEFINES="$STD_CDEFINES -DISC_MEM_DEFAULTFILL=1 -DISC_LIST_CHECKINIT=1 -DDNS_RDATASET_MAX_RECORDS=5000 -DDNS_RBTDB_MAX_RTYPES=5000"
|
|
test "${enable_fixed_rrset+set}" = set || enable_fixed_rrset=yes
|
|
test "${enable_querytrace+set}" = set || enable_querytrace=yes
|
|
test "${with_cmocka+set}" = set || with_cmocka=yes
|
|
diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
|
|
index d86ed64..be77250 100644
|
|
--- a/lib/dns/rbtdb.c
|
|
+++ b/lib/dns/rbtdb.c
|
|
@@ -6196,6 +6196,10 @@ update_recordsandxfrsize(bool add, rbtdb_version_t *rbtversion,
|
|
RWUNLOCK(&rbtversion->rwlock, isc_rwlocktype_write);
|
|
}
|
|
|
|
+#ifndef DNS_RBTDB_MAX_RTYPES
|
|
+#define DNS_RBTDB_MAX_RTYPES 100
|
|
+#endif /* DNS_RBTDB_MAX_RTYPES */
|
|
+
|
|
/*
|
|
* write lock on rbtnode must be held.
|
|
*/
|
|
@@ -6217,6 +6221,7 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, const dns_name_t *nodename,
|
|
rbtdb_rdatatype_t negtype, sigtype;
|
|
dns_trust_t trust;
|
|
int idx;
|
|
+ uint32_t ntypes;
|
|
|
|
/*
|
|
* Add an rdatasetheader_t to a node.
|
|
@@ -6280,6 +6285,7 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, const dns_name_t *nodename,
|
|
set_ttl(rbtdb, topheader, 0);
|
|
mark_header_ancient(rbtdb, topheader);
|
|
}
|
|
+ ntypes = 0;
|
|
goto find_header;
|
|
}
|
|
/*
|
|
@@ -6302,8 +6308,10 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, const dns_name_t *nodename,
|
|
* check for an extant non-ancient NODATA ncache
|
|
* entry which covers the same type as the RRSIG.
|
|
*/
|
|
+ ntypes = 0;
|
|
for (topheader = rbtnode->data; topheader != NULL;
|
|
topheader = topheader->next) {
|
|
+ ntypes++;
|
|
if ((topheader->type ==
|
|
RBTDB_RDATATYPE_NCACHEANY) ||
|
|
(newheader->type == sigtype &&
|
|
@@ -6347,8 +6355,10 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, const dns_name_t *nodename,
|
|
}
|
|
}
|
|
|
|
+ ntypes = 0;
|
|
for (topheader = rbtnode->data; topheader != NULL;
|
|
topheader = topheader->next) {
|
|
+ ntypes++;
|
|
if (prio_type(topheader->type)) {
|
|
prioheader = topheader;
|
|
}
|
|
@@ -6733,6 +6743,13 @@ find_header:
|
|
/*
|
|
* No rdatasets of the given type exist at the node.
|
|
*/
|
|
+
|
|
+ if (ntypes > DNS_RBTDB_MAX_RTYPES) {
|
|
+ free_rdataset(rbtdb, rbtdb->common.mctx,
|
|
+ newheader);
|
|
+ return (ISC_R_QUOTA);
|
|
+ }
|
|
+
|
|
newheader->down = NULL;
|
|
|
|
if (prio_type(newheader->type)) {
|
|
--
|
|
2.33.0
|
|
|