upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Robust checks on dname validity from rdata for dname compare.

Browse source 
git-svn-id: file:///svn/unbound/trunk@2892 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2013-04-25 10:28:25 +00:00
parent 946a6e3646
commit fbedfb7429
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/Changelog
View file

@ -1,3 +1,6 @@
25 April 2013: Wouter
- Robust checks on dname validity from rdata for dname compare.
19 April 2013: Wouter 19 April 2013: Wouter
- Fixup snprintf return value usage, fixed libunbound_get_option. - Fixup snprintf return value usage, fixed libunbound_get_option.

7
validator/val_sigcrypt.c
View file

@ -808,7 +808,12 @@ canonical_compare(struct ub_packed_rrset_key* rrset, size_t i, size_t j)
case LDNS_RR_TYPE_MR: case LDNS_RR_TYPE_MR:
case LDNS_RR_TYPE_PTR: case LDNS_RR_TYPE_PTR:
case LDNS_RR_TYPE_DNAME: case LDNS_RR_TYPE_DNAME:
return query_dname_compare(d->rr_data[i]+2, /* the wireread function has already checked these
* dname's for correctness, and this double checks */
if(!dname_valid(d->rr_data[i]+2, d->rr_len[i]-2) ||
!dname_valid(d->rr_data[j]+2, d->rr_len[j]-2))
return 0;
return query_dname_compare(d->rr_data[i]+2,
d->rr_data[j]+2); d->rr_data[j]+2);
/* These RR types have STR and fixed size rdata fields /* These RR types have STR and fixed size rdata fields

2
validator/val_utils.c
View file

@ -773,6 +773,8 @@ rrset_has_signer(struct ub_packed_rrset_key* rrset, uint8_t* name, size_t len)
for(i = d->count; i< d->count+d->rrsig_count; i++) { for(i = d->count; i< d->count+d->rrsig_count; i++) {
if(d->rr_len[i] > 2+18+len) { if(d->rr_len[i] > 2+18+len) {
/* at least rdatalen + signature + signame (+1 sig)*/ /* at least rdatalen + signature + signame (+1 sig)*/
if(!dname_valid(d->rr_data[i]+2+18, d->rr_len[i]-2-18))
continue;
if(query_dname_compare(name, d->rr_data[i]+2+18) == 0) if(query_dname_compare(name, d->rr_data[i]+2+18) == 0)
{ {
return 1; return 1;