From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 2 Apr 2007 10:16:02 +0000 (+0000)
Subject: review of worker.c
X-Git-Tag: release-0.2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6ab7d4f5018f575f3d637811cd6724b455c1c0c;p=thirdparty%2Funbound.git

review of worker.c


git-svn-id: file:///svn/unbound/trunk@211 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/daemon/worker.c b/daemon/worker.c
index dc7605bc4..2cad79000 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -158,13 +158,15 @@ worker_handle_reply(struct comm_point* c, void* arg, int error,
 		replyerror(LDNS_RCODE_SERVFAIL, w);
 		return 0;
 	}
-	memmove(rep->reply, ldns_buffer_at(c->buffer, DNS_ID_AND_FLAGS), 
+	memcpy(rep->reply, ldns_buffer_at(c->buffer, DNS_ID_AND_FLAGS), 
 		rep->replysize);
 	reply_info_answer_iov(rep, w->query_id, w->query_flags, 
 		&w->query_reply);
 	req_release(w);
 	/* store or update reply in the cache */
 	if(!(e = query_info_entrysetup(&w->qinfo, rep, w->query_hash))) {
+		free(rep->reply);
+		free(rep);
 		log_err("out of memory");
 		return 0;
 	}
@@ -291,10 +293,11 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 	}
 	h = query_info_hash(&qinfo);
 	if((e=slabhash_lookup(worker->daemon->msg_cache, h, &qinfo, 0))) {
-		/* answer from cache */
+		/* answer from cache - we have acquired a readlock on it */
+		uint16_t id;
 		log_info("answer from the cache");
-		reply_info_answer_iov((struct reply_info*)e->data, 
-			ldns_buffer_read_u16_at(c->buffer, 0),
+		memcpy(&id, ldns_buffer_begin(c->buffer), sizeof(uint16_t));
+		reply_info_answer_iov((struct reply_info*)e->data, id,
 			ldns_buffer_read_u16_at(c->buffer, 2), repinfo);
 		lock_rw_unlock(&e->lock);
 		return 0;
@@ -307,7 +310,7 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 	}
 
 	/* grab a work request structure for this new request */
-	if(!worker->free_queries) {
+	if(!(w = worker->free_queries)) {
 		/* we could get this due to a slow tcp incoming query, 
 		   that started before we performed listen_pushback */
 		verbose(VERB_DETAIL, "worker: too many incoming requests "
@@ -315,7 +318,6 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 		comm_point_drop_reply(repinfo);
 		return 0;
 	}
-	w = worker->free_queries;
 	worker->free_queries = w->next;
 	worker->num_requests ++;
 	log_assert(worker->num_requests <= worker->request_size);
@@ -351,14 +353,17 @@ worker_sighandler(int sig, void* arg)
 			break;
 		case SIGINT:
 			log_info("caught signal SIGINT");
+			worker->need_to_restart = 0;
 			comm_base_exit(worker->base);
 			break;
 		case SIGQUIT:
 			log_info("caught signal SIGQUIT");
+			worker->need_to_restart = 0;
 			comm_base_exit(worker->base);
 			break;
 		case SIGTERM:
 			log_info("caught signal SIGTERM");
+			worker->need_to_restart = 0;
 			comm_base_exit(worker->base);
 			break;
 		default:
diff --git a/doc/Changelog b/doc/Changelog
index 76fb10a5b..120700d14 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,8 @@
+2 April 2007: Wouter
+	- check sizes of udp received messages, not too short.
+	- review changes. Some memmoves can be memcpys: 4byte aligned.
+	  set id correctly on cached answers. 
+
 29 March 2007: Wouter
 	- writev or sendmsg used when answering from cache.
 	  This avoids a copy of the data.
diff --git a/services/outside_network.c b/services/outside_network.c
index 132b7c88b..a4cadeb08 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -123,6 +123,10 @@ outnet_udp_cb(struct comm_point* c, void* arg, int error,
 		log_info("outnetudp got udp error %d", error);
 		return 0;
 	}
+	if(ldns_buffer_limit(c->buffer) < LDNS_HEADER_SIZE) {
+		log_info("outnetudp udp too short");
+		return 0;
+	}
 	log_assert(reply_info);
 
 	/* setup lookup key */
diff --git a/util/data/msgreply.c b/util/data/msgreply.c
index feaf9395e..405932cf9 100644
--- a/util/data/msgreply.c
+++ b/util/data/msgreply.c
@@ -98,7 +98,7 @@ query_info_allocqname(struct query_info* m)
 		log_err("query_info_allocqname: out of memory");
 		return 0; /* out of memory */
 	}
-	memmove(m->qname, q, m->qnamesize);
+	memcpy(m->qname, q, m->qnamesize);
 	return 1;
 }