ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

3547. [bug] Some malformed unknown rdata records were not properly

Browse Source 
detected and rejected. [RT #33129]
(cherry picked from commit 1cc4695f0d)
This commit is contained in:
Mark Andrews
2013-04-08 09:55:14 +10:00
parent 4af84ed4ca
commit 234265bc55
5 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
3547. [bug] Some malformed unknown rdata records were not properly
detected and rejected. [RT #33129]
--- 9.6-ESV-R9rc1 released ---
3546. [func] Add EUI48 and EUI64 types. [RT #33082]

2
bin/tests/system/unknown/clean.sh
View File

@@ -17,7 +17,7 @@
# $Id: clean.sh,v 1.7 2007/09/26 03:22:44 marka Exp $
rm -f dig.out
rm -f dig.out check.out
rm -f */named.memstats
rm -f */*.bk
rm -f */*.bk.*

11
bin/tests/system/unknown/tests.sh
View File

@@ -161,12 +161,21 @@ echo '"#" "2" "0145"' | diff - dig.out || ret=1
[ $ret = 0 ] || echo "I: failed"
status=`expr $status + $ret`
echo "I:check that '"'TXT \# text'"' is not treated as the unknown escape sequence"
echo "I:check that 'TXT \# text' is not treated as the unknown escape sequence"
ret=0
$DIG $DIGOPTS @10.53.0.1 +tcp +short txt9.example txt > dig.out
echo '"#" "text"' | diff - dig.out || ret=1
[ $ret = 0 ] || echo "I: failed"
status=`expr $status + $ret`
echo "I:check that 'TYPE353 \# cat' produces 'not a valid number'"
ret=0
$CHECKZONE nan.bad zones/nan.bad > check.out 2>&1
grep "not a valid number" check.out > /dev/null || ret=1
[ $ret = 0 ] || echo "I: failed"
status=`expr $status + $ret`
echo "I:exit status: $status"
exit $status

1
bin/tests/system/unknown/zones/nan.bad Normal file
View File

@@ -0,0 +1 @@
@ 0 IN TYPE353 \# cat 010101010101010101

6
lib/dns/rdata.c
View File

@@ -608,9 +608,9 @@ unknown_fromtext(dns_rdataclass_t rdclass, dns_rdatatype_t type,
if (type == 0 || dns_rdatatype_ismeta(type))
return (DNS_R_METATYPE);
result = isc_lex_getmastertoken(lexer, &token, isc_tokentype_number,
ISC_FALSE);
if (result == ISC_R_SUCCESS && token.value.as_ulong > 65535U)
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_number,
ISC_FALSE));
if (token.value.as_ulong > 65535U)
return (ISC_R_RANGE);
result = isc_buffer_allocate(mctx, &buf, token.value.as_ulong);
if (result != ISC_R_SUCCESS)