From a8cc952fab670ebafea6b659538ea06af3e5f20c Mon Sep 17 00:00:00 2001 From: Kris Kennaway Date: Thu, 8 Jun 2000 03:54:45 +0000 Subject: [PATCH] Prevent a non-exploitable remote buffer overflow. Reported by: twitch Submitted by: Guido van Rooij Reviewed by: security-officer --- usr.sbin/syslogd/syslogd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index ca5391d34e7..6182c014c6f 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -1791,10 +1791,10 @@ validate(sin, hname) /* traditional behaviour, allow everything */ return 1; - strncpy(name, hname, sizeof name); + strlcpy(name, hname, sizeof name); if (strchr(name, '.') == NULL) { - strncat(name, ".", sizeof name - strlen(name) - 1); - strncat(name, LocalDomain, sizeof name - strlen(name) - 1); + strlcat(name, ".", sizeof name); + strlcat(name, LocalDomain, sizeof name); } dprintf("validate: dgram from IP %s, port %d, name %s;\n", addr2ascii(AF_INET, &sin->sin_addr, sizeof(struct in_addr), 0),