secmark: Add libip6t_CONNSECMARK

This patch adds the shared library module for the CONNSECMARK target
(IPv6).

Signed-off-by: James Morris <jmorris@namei.org>

diff --git a/extensions/Makefile b/extensions/Makefile
index 15a8f698dec01e9ca4cc7e9372966a4751b21ca5..b1daa7320cf1ae48afb1bcc77112e135077f0664 100644 (file)
--- a/extensions/Makefile
+++ b/extensions/Makefile
@@ -10,7 +10,7 @@ PF6_EXT_SLIB:=connmark eui64 hl icmp6 length limit mac mark multiport owner phys
 
 ifeq ($(DO_SELINUX), 1)
 PF_EXT_SE_SLIB:=SECMARK CONNSECMARK
-PF6_EXT_SE_SLIB:=SECMARK
+PF6_EXT_SE_SLIB:=SECMARK CONNSECMARK
 endif
 
 # Optionals

diff --git a/extensions/libip6t_CONNSECMARK.c b/extensions/libip6t_CONNSECMARK.c
new file mode 100644 (file)
index 0000000..b11ed07
--- /dev/null
+++ b/extensions/libip6t_CONNSECMARK.c
@@ -0,0 +1,124 @@
+/*
+ * Shared library add-on to ip6tables to add CONNSECMARK target support.
+ *
+ * Based on the MARK and CONNMARK targets.
+ *
+ * Copyright (C) 2006 Red Hat, Inc., James Morris <jmorris@redhat.com>
+ */
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include <ip6tables.h>
+#include <linux/netfilter/xt_CONNSECMARK.h>
+
+#define PFX "CONNSECMARK target: "
+
+static void help(void)
+{
+       printf(
+"CONNSECMARK target v%s options:\n"
+"  --save                   Copy security mark from packet to conntrack\n"
+"  --restore                Copy security mark from connection to packet\n"
+"\n",
+IPTABLES_VERSION);
+}
+
+static struct option opts[] = {
+       { "save", 0, 0, '1' },
+       { "restore", 0, 0, '2' },
+       { 0 }
+};
+
+static int parse(int c, char **argv, int invert, unsigned int *flags,
+                 const struct ip6t_entry *entry, struct ip6t_entry_target **target)
+{
+       struct xt_connsecmark_target_info *info =
+               (struct xt_connsecmark_target_info*)(*target)->data;
+
+       switch (c) {
+       case '1':
+               if (*flags & CONNSECMARK_SAVE)
+                       exit_error(PARAMETER_PROBLEM, PFX
+                                  "Can't specify --save twice");
+               info->mode = CONNSECMARK_SAVE;
+               *flags |= CONNSECMARK_SAVE;
+               break;
+
+       case '2':
+               if (*flags & CONNSECMARK_RESTORE)
+                       exit_error(PARAMETER_PROBLEM, PFX
+                                  "Can't specify --restore twice");
+               info->mode = CONNSECMARK_RESTORE;
+               *flags |= CONNSECMARK_RESTORE;
+               break;
+
+       default:
+               return 0;
+       }
+
+       return 1;
+}
+
+static void final_check(unsigned int flags)
+{
+       if (!flags)
+               exit_error(PARAMETER_PROBLEM, PFX "parameter required");
+
+       if (flags == (CONNSECMARK_SAVE|CONNSECMARK_RESTORE))
+               exit_error(PARAMETER_PROBLEM, PFX "only one flag of --save "
+                          "or --restore is allowed");
+}
+
+static void print_connsecmark(struct xt_connsecmark_target_info *info)
+{
+       switch (info->mode) {
+       case CONNSECMARK_SAVE:
+               printf("save ");
+               break;
+               
+       case CONNSECMARK_RESTORE:
+               printf("restore ");
+               break;
+               
+       default:
+               exit_error(OTHER_PROBLEM, PFX "invalid mode %hhu\n", info->mode);
+       }
+}
+
+static void print(const struct ip6t_ip6 *ip,
+                 const struct ip6t_entry_target *target, int numeric)
+{
+       struct xt_connsecmark_target_info *info =
+               (struct xt_connsecmark_target_info*)(target)->data;
+
+       printf("CONNSECMARK ");
+       print_connsecmark(info);
+}
+
+static void save(const struct ip6t_ip6 *ip, const struct ip6t_entry_target *target)
+{
+       struct xt_connsecmark_target_info *info =
+               (struct xt_connsecmark_target_info*)target->data;
+
+       printf("--");
+       print_connsecmark(info);
+}
+
+static struct ip6tables_target connsecmark = {
+       .name           = "CONNSECMARK",
+       .version        = IPTABLES_VERSION,
+       .size           = IP6T_ALIGN(sizeof(struct xt_connsecmark_target_info)),
+       .userspacesize  = IP6T_ALIGN(sizeof(struct xt_connsecmark_target_info)),
+       .parse          = &parse,
+       .help           = &help,
+       .final_check    = &final_check,
+       .print          = &print,
+       .save           = &save,
+       .extra_opts     = opts
+};
+
+void _init(void)
+{
+       register_target6(&connsecmark);
+}

diff --git a/extensions/libip6t_CONNSECMARK.man b/extensions/libip6t_CONNSECMARK.man
new file mode 100644 (file)
index 0000000..b94353a
--- /dev/null
+++ b/extensions/libip6t_CONNSECMARK.man
@@ -0,0 +1,15 @@
+This module copies security markings from packets to connections
+(if unlabeled), and from connections back to packets (also only
+if unlabeled).  Typically used in conjunction with SECMARK, it is
+only valid in the
+.B mangle
+table.
+.TP
+.B --save
+If the packet has a security marking, copy it to the connection
+if the connection is not marked.
+.TP
+.B --restore
+If the packet does not have a security marking, and the connection
+does, copy the security marking from the connection to the packet.
+