upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 01:31:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[9.20] fix: usr: Remove unnecessary dns_name_free call

Browse source 
When processing a catalog zone member's primaries definition and
there is a TXT record containing an invalid name TSIG key name,
dns_name_free was incorrectly called triggering an assertion.
This has been fixed.

Closes #5858

Backport of MR !11832

Merge branch 'backport-5858-remove-unnecessary-dns-name-free-call-9.20' into 'bind-9.20'

See merge request isc-projects/bind9!11848
This commit is contained in:
Mark Andrews 2026-04-15 13:53:52 +10:00
commit 35d94fffb0
5 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bin/tests/system/catz/ns1/catalog-bad6.example.db Normal file
View file

@ -0,0 +1,7 @@
@ 3600 SOA . . 1 86400 3600 86400 3600
@ 3600 IN NS invalid.
version IN TXT "2"
deadbeef.zones IN PTR member.example.
mykey.primaries.ext.deadbeef.zones IN A 192.0.2.1
; bad key name label too big
mykey.primaries.ext.deadbeef.zones IN TXT "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA.example.com"

10
bin/tests/system/catz/ns1/named.conf.j2
View file

@ -128,6 +128,16 @@ view "default" {
notify explicit;
};
# Bad TSIG key name
zone "catalog-bad6.example" {
type primary;
file "catalog-bad6.example.db";
allow-transfer { any; };
allow-update { any; };
also-notify { 10.53.0.2; };
notify explicit;
};
# A catalog zone that requires TLS to be used
zone "catalog-tls.example" {
type primary;

10
bin/tests/system/catz/ns2/named.conf.j2
View file

@ -101,6 +101,10 @@ view "default" {
default-masters { 10.53.0.1; }
min-update-interval 1s
in-memory yes;
zone "catalog-bad6.example"
default-masters { 10.53.0.1; }
min-update-interval 1s
in-memory yes;
};
{% if bad_dlz %}
@ -206,6 +210,12 @@ view "default" {
primaries { 10.53.0.1; };
};
# Bad TSIG key name
zone "catalog-bad6.example" {
type secondary;
file "catalog-bad6.example.db";
primaries { 10.53.0.1; };
};
};
view "ch" ch {

6
bin/tests/system/catz/tests.sh
View file

@ -134,6 +134,12 @@ grep -F "catz: dns_catz_zone_add catalog-bad5.example" ns2/named.run && ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status + ret))
echo_i "checking that catalog-bad6.example (invalid TSIG key name) is handled ($n)"
ret=0
wait_for_message ns2/named.run "catz: invalid record in catalog zone - mykey.primaries.ext.deadbeef.zones.catalog-bad6.example IN TXT (label too long) - ignoring" || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status + ret))
nextpart ns2/named.run >/dev/null
##########################################################################

1
lib/dns/catz.c
View file

@ -1467,7 +1467,6 @@ catz_process_primaries(dns_catz_zone_t *catz, dns_ipkeylist_t *ipkl,
result = dns_name_fromstring(keyname, keycbuf,
dns_rootname, 0, mctx);
if (result != ISC_R_SUCCESS) {
dns_name_free(keyname, mctx);
isc_mem_put(mctx, keyname, sizeof(*keyname));
return result;
}