diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2014-08-22 16:14:12 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2014-08-22 16:14:12 +0000 |
| commit | f2507b8c232046124edd6334f46ca3c6daac2903 (patch) | |
| tree | bcbb8ea88576767420dc3040e9e1317b791028fe /usr.sbin | |
| parent | 73da6cb1ad369265523bf6da973b657e14566001 (diff) | |
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@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/syslogd/syslogd.c | 19 |
1 files changed, 16 insertions, 3 deletions
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\"", |