linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / ipv4 / netfilter / ipt_owner.c

diff --git a/net/ipv4/netfilter/ipt_owner.c b/net/ipv4/netfilter/ipt_owner.c
index 5ac6ac0..4843d0c 100644 (file)
--- a/net/ipv4/netfilter/ipt_owner.c
+++ b/net/ipv4/netfilter/ipt_owner.c
@@ -25,7 +25,6 @@ static int
 match(const struct sk_buff *skb,
       const struct net_device *in,
       const struct net_device *out,
-      const struct xt_match *match,
       const void *matchinfo,
       int offset,
       unsigned int protoff,
@@ -54,39 +53,49 @@ match(const struct sk_buff *skb,
 static int
 checkentry(const char *tablename,
            const void *ip,
-          const struct xt_match *match,
            void *matchinfo,
            unsigned int matchsize,
            unsigned int hook_mask)
 {
        const struct ipt_owner_info *info = matchinfo;
 
+        if (hook_mask
+            & ~((1 << NF_IP_LOCAL_OUT) | (1 << NF_IP_POST_ROUTING))) {
+                printk("ipt_owner: only valid for LOCAL_OUT or POST_ROUTING.\n");
+                return 0;
+        }
+
+       if (matchsize != IPT_ALIGN(sizeof(struct ipt_owner_info))) {
+               printk("Matchsize %u != %Zu\n", matchsize,
+                      IPT_ALIGN(sizeof(struct ipt_owner_info)));
+               return 0;
+       }
+
        if (info->match & (IPT_OWNER_PID|IPT_OWNER_SID|IPT_OWNER_COMM)) {
                printk("ipt_owner: pid, sid and command matching "
                       "not supported anymore\n");
                return 0;
        }
+
        return 1;
 }
 
 static struct ipt_match owner_match = {
        .name           = "owner",
-       .match          = match,
-       .matchsize      = sizeof(struct ipt_owner_info),
-       .hooks          = (1 << NF_IP_LOCAL_OUT) | (1 << NF_IP_POST_ROUTING),
-       .checkentry     = checkentry,
+       .match          = &match,
+       .checkentry     = &checkentry,
        .me             = THIS_MODULE,
 };
 
-static int __init ipt_owner_init(void)
+static int __init init(void)
 {
        return ipt_register_match(&owner_match);
 }
 
-static void __exit ipt_owner_fini(void)
+static void __exit fini(void)
 {
        ipt_unregister_match(&owner_match);
 }
 
-module_init(ipt_owner_init);
-module_exit(ipt_owner_fini);
+module_init(init);
+module_exit(fini);