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

fix bug#395: id bits of other query may leak out under conditions

Browse source 
git-svn-id: file:///svn/unbound/trunk@2444 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2011-06-30 09:42:20 +00:00
parent 668bcfc499
commit bc06ab0377
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
daemon/worker.c
View file

@ -739,17 +739,21 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
worker->stats.unwanted_queries++; worker->stats.unwanted_queries++;
return 0; return 0;
} else if(acl == acl_refuse) { } else if(acl == acl_refuse) {
log_addr(VERB_ALGO, "refused query from",
&repinfo->addr, repinfo->addrlen);
log_buf(VERB_ALGO, "refuse", c->buffer);
if(worker->stats.extended)
worker->stats.unwanted_queries++;
if(worker_check_request(c->buffer, worker) == -1) {
comm_point_drop_reply(repinfo);
return 0; /* discard this */
}
ldns_buffer_set_limit(c->buffer, LDNS_HEADER_SIZE); ldns_buffer_set_limit(c->buffer, LDNS_HEADER_SIZE);
ldns_buffer_write_at(c->buffer, 4, ldns_buffer_write_at(c->buffer, 4,
(uint8_t*)"\0\0\0\0\0\0\0\0", 8); (uint8_t*)"\0\0\0\0\0\0\0\0", 8);
LDNS_QR_SET(ldns_buffer_begin(c->buffer)); LDNS_QR_SET(ldns_buffer_begin(c->buffer));
LDNS_RCODE_SET(ldns_buffer_begin(c->buffer), LDNS_RCODE_SET(ldns_buffer_begin(c->buffer),
LDNS_RCODE_REFUSED); LDNS_RCODE_REFUSED);
log_addr(VERB_ALGO, "refused query from",
&repinfo->addr, repinfo->addrlen);
log_buf(VERB_ALGO, "refuse", c->buffer);
if(worker->stats.extended)
worker->stats.unwanted_queries++;
return 1; return 1;
} }
if((ret=worker_check_request(c->buffer, worker)) != 0) { if((ret=worker_check_request(c->buffer, worker)) != 0) {

1
doc/Changelog
View file

@ -1,6 +1,7 @@
30 June 2011: Wouter 30 June 2011: Wouter
- tag relase 1.4.11, trunk is 1.4.12 development. - tag relase 1.4.11, trunk is 1.4.12 development.
- iana portlist updated. - iana portlist updated.
- fix bug#395: id bits of other query may leak out under conditions
23 June 2011: Wouter 23 June 2011: Wouter
- Changed -flto check to support clang compiler. - Changed -flto check to support clang compiler.