don't allow newlines in LOG prefix (Phil Oester) (Closes: #312)

diff --git a/extensions/libip6t_LOG.c b/extensions/libip6t_LOG.c
index 3cde0eece1964815f4e3d341498e680a0cbe2754..7ca58e55ba4c72f108305e3e4ef0c6d7a14a6c43 100644 (file)
--- a/extensions/libip6t_LOG.c
+++ b/extensions/libip6t_LOG.c
@@ -134,6 +134,10 @@ parse(int c, char **argv, int invert, unsigned int *flags,
                                   "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 --git a/extensions/libipt_LOG.c b/extensions/libipt_LOG.c
index 74d6555209e4a0677861a548c019732eb0daeae5..5e5d3fd865cb5a929000c22e7583741c0fb8a099 100644 (file)
--- a/extensions/libipt_LOG.c
+++ b/extensions/libipt_LOG.c
@@ -143,6 +143,10 @@ parse(int c, char **argv, int invert, unsigned int *flags,
                                   "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;