From: bluhm <bluhm@openbsd.org>
Date: Fri, 22 Aug 2014 16:14:11 +0000 (+0000)
Subject: Instead of getting a nasty error message from privsep
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=57d437ee6a40b2fd4e58c671d6d64310d4d62fc5;p=openbsd

Instead of getting a nasty error message from privsep
"syslogd: priv_getaddrinfo: overflow attempt in hostname"
check the host and port length when parsing the config.
OK henning@
---

diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index 80d46005652..3880ef8ea23 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syslogd.c,v 1.116 2014/08/21 17:00:34 bluhm Exp $	*/
+/*	$OpenBSD: syslogd.c,v 1.117 2014/08/22 16:14:11 bluhm Exp $	*/
 
 /*
  * Copyright (c) 1983, 1988, 1993, 1994
@@ -1547,8 +1547,21 @@ cfline(char *line, char *prog)
 			logerror(ebuf);
 			break;
 		}
-		if (priv_getaddrinfo(host,
-		    port == NULL ? "syslog" : port,
+		if (strlen(host) >= MAXHOSTNAMELEN) {
+			snprintf(ebuf, sizeof(ebuf), "host too long \"%s\"",
+			    f->f_un.f_forw.f_loghost);
+			logerror(ebuf);
+			break;
+		}
+		if (port == NULL)
+			port = "syslog";
+		if (strlen(port) >= NI_MAXSERV) {
+			snprintf(ebuf, sizeof(ebuf), "port too long \"%s\"",
+			    f->f_un.f_forw.f_loghost);
+			logerror(ebuf);
+			break;
+		}
+		if (priv_getaddrinfo(host, port,
 		    (struct sockaddr*)&f->f_un.f_forw.f_addr,
 		    sizeof(f->f_un.f_forw.f_addr)) != 0) {
 			snprintf(ebuf, sizeof(ebuf), "bad hostname \"%s\"",