netfilter: nf_conntrack: use per-conntrack locks for protocol data

[linux-2.6.git] / net / netfilter / xt_SECMARK.c

diff --git a/net/netfilter/xt_SECMARK.c b/net/netfilter/xt_SECMARK.c
index f3e78c592f3a475a6063b4e30f0c966129681d76..7a6f9e6f5dfaa6b7e4e5eb57890542a99065b0e3 100644 (file)
--- a/net/netfilter/xt_SECMARK.c
+++ b/net/netfilter/xt_SECMARK.c
@@ -5,7 +5,7 @@
  * Based on the nfmark match by:
  * (C) 1999-2001 Marc Boucher <marc@mbsi.ca>
  *
- * (C) 2006 Red Hat, Inc., James Morris <jmorris@redhat.com>
+ * (C) 2006,2008 Red Hat, Inc., James Morris <jmorris@redhat.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -20,7 +20,7 @@
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("James Morris <jmorris@redhat.com>");
-MODULE_DESCRIPTION("ip[6]tables SECMARK modification module");
+MODULE_DESCRIPTION("Xtables: packet security mark modification");
 MODULE_ALIAS("ipt_SECMARK");
 MODULE_ALIAS("ip6t_SECMARK");
 
@@ -28,13 +28,11 @@ MODULE_ALIAS("ip6t_SECMARK");
 
 static u8 mode;
 
-static unsigned int target(struct sk_buff **pskb, const struct net_device *in,
-                          const struct net_device *out, unsigned int hooknum,
-                          const struct xt_target *target,
-                          const void *targinfo)
+static unsigned int
+secmark_tg(struct sk_buff *skb, const struct xt_target_param *par)
 {
        u32 secmark = 0;
-       const struct xt_secmark_target_info *info = targinfo;
+       const struct xt_secmark_target_info *info = par->targinfo;
 
        BUG_ON(info->mode != mode);
 
@@ -47,7 +45,7 @@ static unsigned int target(struct sk_buff **pskb, const struct net_device *in,
                BUG();
        }
 
-       (*pskb)->secmark = secmark;
+       skb->secmark = secmark;
        return XT_CONTINUE;
 }
 
@@ -72,20 +70,26 @@ static bool checkentry_selinux(struct xt_secmark_target_info *info)
                return false;
        }
 
-       err = selinux_relabel_packet_permission(sel->selsid);
+       err = selinux_secmark_relabel_packet_permission(sel->selsid);
        if (err) {
                printk(KERN_INFO PFX "unable to obtain relabeling permission\n");
                return false;
        }
 
+       selinux_secmark_refcount_inc();
        return true;
 }
 
-static bool checkentry(const char *tablename, const void *entry,
-                      const struct xt_target *target, void *targinfo,
-                      unsigned int hook_mask)
+static bool secmark_tg_check(const struct xt_tgchk_param *par)
 {
-       struct xt_secmark_target_info *info = targinfo;
+       struct xt_secmark_target_info *info = par->targinfo;
+
+       if (strcmp(par->table, "mangle") != 0 &&
+           strcmp(par->table, "security") != 0) {
+               printk(KERN_INFO PFX "target only valid in the \'mangle\' "
+                      "or \'security\' tables, not \'%s\'.\n", par->table);
+               return false;
+       }
 
        if (mode && mode != info->mode) {
                printk(KERN_INFO PFX "mode already set to %hu cannot mix with "
@@ -109,37 +113,34 @@ static bool checkentry(const char *tablename, const void *entry,
        return true;
 }
 
-static struct xt_target xt_secmark_target[] = {
-       {
-               .name           = "SECMARK",
-               .family         = AF_INET,
-               .checkentry     = checkentry,
-               .target         = target,
-               .targetsize     = sizeof(struct xt_secmark_target_info),
-               .table          = "mangle",
-               .me             = THIS_MODULE,
-       },
-       {
-               .name           = "SECMARK",
-               .family         = AF_INET6,
-               .checkentry     = checkentry,
-               .target         = target,
-               .targetsize     = sizeof(struct xt_secmark_target_info),
-               .table          = "mangle",
-               .me             = THIS_MODULE,
-       },
+static void secmark_tg_destroy(const struct xt_tgdtor_param *par)
+{
+       switch (mode) {
+       case SECMARK_MODE_SEL:
+               selinux_secmark_refcount_dec();
+       }
+}
+
+static struct xt_target secmark_tg_reg __read_mostly = {
+       .name       = "SECMARK",
+       .revision   = 0,
+       .family     = NFPROTO_UNSPEC,
+       .checkentry = secmark_tg_check,
+       .destroy    = secmark_tg_destroy,
+       .target     = secmark_tg,
+       .targetsize = sizeof(struct xt_secmark_target_info),
+       .me         = THIS_MODULE,
 };
 
-static int __init xt_secmark_init(void)
+static int __init secmark_tg_init(void)
 {
-       return xt_register_targets(xt_secmark_target,
-                                  ARRAY_SIZE(xt_secmark_target));
+       return xt_register_target(&secmark_tg_reg);
 }
 
-static void __exit xt_secmark_fini(void)
+static void __exit secmark_tg_exit(void)
 {
-       xt_unregister_targets(xt_secmark_target, ARRAY_SIZE(xt_secmark_target));
+       xt_unregister_target(&secmark_tg_reg);
 }
 
-module_init(xt_secmark_init);
-module_exit(xt_secmark_fini);
+module_init(secmark_tg_init);
+module_exit(secmark_tg_exit);