From 3ce098c43482bfac83e0779566c9196a187956f6 Mon Sep 17 00:00:00 2001
From: henning <>
Date: Mon, 18 Apr 2005 20:46:02 +0000
Subject: [PATCH] extra paranoia, from a discussion with joerg

---
 src/usr.sbin/ntpd/ntpd.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c
index a16defa8..f8b04c3c 100644
--- a/src/usr.sbin/ntpd/ntpd.c
+++ b/src/usr.sbin/ntpd/ntpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntpd.c,v 1.34 2005/03/31 17:02:43 henning Exp $ */
+/*	$OpenBSD: ntpd.c,v 1.35 2005/04/18 20:46:02 henning Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -282,7 +282,11 @@ dispatch_imsg(struct ntpd_conf *conf)
 			break;
 		case IMSG_HOST_DNS:
 			name = imsg.data;
-			if (imsg.hdr.len != strlen(name) + 1 + IMSG_HEADER_SIZE)
+			if (imsg.hdr.len < 1 + IMSG_HEADER_SIZE)
+				fatalx("invalid IMSG_HOST_DNS received");
+			imsg.hdr.len -= 1 + IMSG_HEADER_SIZE;
+			if (name[imsg.hdr.len] != '\0' ||
+			    strlen(name) != imsg.hdr.len)
 				fatalx("invalid IMSG_HOST_DNS received");
 			if ((cnt = host_dns(name, &hn)) > 0) {
 				buf = imsg_create(ibuf, IMSG_HOST_DNS,