[netfilter-cvslog] r3819 - trunk/iptables/extensions

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-04-01 09:07:00 +0200 (Fri, 01 Apr 2005)
New Revision: 3819

Modified:
   trunk/iptables/extensions/libip6t_LOG.c
   trunk/iptables/extensions/libipt_LOG.c
Log:
don't allow newlines in LOG prefix (Phil Oester) (Closes: #312)


Modified: trunk/iptables/extensions/libip6t_LOG.c
===================================================================
--- trunk/iptables/extensions/libip6t_LOG.c	2005-04-01 06:58:38 UTC (rev 3818)
+++ trunk/iptables/extensions/libip6t_LOG.c	2005-04-01 07:07:00 UTC (rev 3819)
@@ -134,6 +134,10 @@
 				   "Maximum prefix length %u for --log-prefix",
 				   (unsigned int)sizeof(loginfo->prefix) - 1);
 
+		if (strlen(optarg) != strlen(strtok(optarg, "\n")))
+			exit_error(PARAMETER_PROBLEM,
+				   "Newlines not allowed in --log-prefix");
+
 		strcpy(loginfo->prefix, optarg);
 		*flags |= IP6T_LOG_OPT_PREFIX;
 		break;

Modified: trunk/iptables/extensions/libipt_LOG.c
===================================================================
--- trunk/iptables/extensions/libipt_LOG.c	2005-04-01 06:58:38 UTC (rev 3818)
+++ trunk/iptables/extensions/libipt_LOG.c	2005-04-01 07:07:00 UTC (rev 3819)
@@ -143,6 +143,10 @@
 				   "Maximum prefix length %u for --log-prefix",
 				   (unsigned int)sizeof(loginfo->prefix) - 1);
 
+		if (strlen(optarg) != strlen(strtok(optarg, "\n")))
+			exit_error(PARAMETER_PROBLEM,
+				   "Newlines not allowed in --log-prefix");
+
 		strcpy(loginfo->prefix, optarg);
 		*flags |= IPT_LOG_OPT_PREFIX;
 		break;