cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Security fix for CVE-2011-3200,

Browse Source 
rsyslog: parseLegacySyslogMsg off-by-two buffer overflow
This commit is contained in:
jasper 2011-09-05 18:24:08 +00:00
parent d4b24bd520
commit 0d2dfae26d
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/rsyslog/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2011/07/07 00:22:37 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.8 2011/09/05 18:24:08 jasper Exp $
SHARED_ONLY = Yes
@ -15,7 +15,7 @@ PKGNAME-mysql = rsyslog-mysql-$V
PKGNAME-pgsql = rsyslog-pgsql-$V
CATEGORIES = sysutils
REVISION-main = 1
REVISION-main = 2
HOMEPAGE = http://www.rsyslog.com/

22
sysutils/rsyslog/patches/patch-tools_syslogd_c
View File

@ -1,6 +1,13 @@
$OpenBSD: patch-tools_syslogd_c,v 1.1.1.1 2010/07/29 21:40:21 steven Exp $
--- tools/syslogd.c.orig Wed Jul 7 11:43:39 2010
+++ tools/syslogd.c Sun Jul 25 21:39:57 2010
$OpenBSD: patch-tools_syslogd_c,v 1.2 2011/09/05 18:24:08 jasper Exp $
Last chunk:
Security fix for CVE-2011-3200,
rsyslog: parseLegacySyslogMsg off-by-two buffer overflow
Patch from upstream via redhat: https://bugzilla.redhat.com/show_bug.cgi?id=727644
--- tools/syslogd.c.orig Thu Aug 5 11:33:54 2010
+++ tools/syslogd.c Mon Sep 5 20:22:07 2011
@@ -173,9 +173,8 @@ static rsRetVal GlobalClassExit(void);
#endif
#endif
@ -13,3 +20,12 @@ $OpenBSD: patch-tools_syslogd_c,v 1.1.1.1 2010/07/29 21:40:21 steven Exp $
#ifndef _PATH_MODDIR
# if defined(__FreeBSD__)
@@ -1291,7 +1290,7 @@ int parseLegacySyslogMsg(msg_t *pMsg, int flags)
* outputs so that only 32 characters max are used by default.
*/
i = 0;
- while(lenMsg > 0 && *p2parse != ':' && *p2parse != ' ' && i < CONF_TAG_MAXSIZE) {
+ while(lenMsg > 0 && *p2parse != ':' && *p2parse != ' ' && i < CONF_TAG_MAXSIZE - 2) {
bufParseTAG[i++] = *p2parse++;
--lenMsg;
}