Merge branch 'audit.b3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit...

[firefly-linux-kernel-4.4.55.git] / net / netfilter / xt_pkttype.c

diff --git a/net/netfilter/xt_pkttype.c b/net/netfilter/xt_pkttype.c
index ab1b2630f97d1d54c1ae64f4ba8626d3606a2988..8b8bca988ac68834068745afb9062cdccf271258 100644 (file)
--- a/net/netfilter/xt_pkttype.c
+++ b/net/netfilter/xt_pkttype.c
@@ -22,6 +22,7 @@ MODULE_ALIAS("ip6t_pkttype");
 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,
@@ -32,50 +33,40 @@ static int match(const struct sk_buff *skb,
        return (skb->pkt_type == info->pkttype) ^ info->invert;
 }
 
-static int checkentry(const char *tablename,
-                  const void *ip,
-                  void *matchinfo,
-                  unsigned int matchsize,
-                  unsigned int hook_mask)
-{
-       if (matchsize != XT_ALIGN(sizeof(struct xt_pkttype_info)))
-               return 0;
-
-       return 1;
-}
-
 static struct xt_match pkttype_match = {
        .name           = "pkttype",
-       .match          = &match,
-       .checkentry     = &checkentry,
+       .match          = match,
+       .matchsize      = sizeof(struct xt_pkttype_info),
+       .family         = AF_INET,
        .me             = THIS_MODULE,
 };
+
 static struct xt_match pkttype6_match = {
        .name           = "pkttype",
-       .match          = &match,
-       .checkentry     = &checkentry,
+       .match          = match,
+       .matchsize      = sizeof(struct xt_pkttype_info),
+       .family         = AF_INET6,
        .me             = THIS_MODULE,
 };
 
-
 static int __init init(void)
 {
        int ret;
-       ret = xt_register_match(AF_INET, &pkttype_match);
+       ret = xt_register_match(&pkttype_match);
        if (ret)
                return ret;
 
-       ret = xt_register_match(AF_INET6, &pkttype6_match);
+       ret = xt_register_match(&pkttype6_match);
        if (ret)
-               xt_unregister_match(AF_INET, &pkttype_match);
+               xt_unregister_match(&pkttype_match);
 
        return ret;
 }
 
 static void __exit fini(void)
 {
-       xt_unregister_match(AF_INET, &pkttype_match);
-       xt_unregister_match(AF_INET6, &pkttype6_match);
+       xt_unregister_match(&pkttype_match);
+       xt_unregister_match(&pkttype6_match);
 }
 
 module_init(init);