[PATCH] Disallow newlines in LOG target --log-prefix

[Phil Oester <kernel@linuxace.com>]

[-- Attachment #1: Type: text/plain, Size: 205 bytes --]

As reported in bugzilla, iptables currently does not complain about
the following:

# iptables -A foo -j LOG --log-prefix 'asdfasdfa
asdf'

Patch below makes it complain, and closes bugzilla #312.

Phil



[-- Attachment #2: patch-logprefix --]
[-- Type: text/plain, Size: 1177 bytes --]

diff -ru iptables-orig/extensions/libip6t_LOG.c iptables-new/extensions/libip6t_LOG.c
--- iptables-orig/extensions/libip6t_LOG.c	2005-02-19 11:19:17.000000000 -0800
+++ iptables-new/extensions/libip6t_LOG.c	2005-03-29 11:30:19.000000000 -0800
@@ -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;
diff -ru iptables-orig/extensions/libipt_LOG.c iptables-new/extensions/libipt_LOG.c
--- iptables-orig/extensions/libipt_LOG.c	2005-02-19 11:19:17.000000000 -0800
+++ iptables-new/extensions/libipt_LOG.c	2005-03-29 11:27:54.000000000 -0800
@@ -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;