netfilter: x_tables: fix net namespace leak when reading /proc/net/xxx_tables_names

[safe/jmp/linux-2.6] / net / netfilter / xt_mac.c

diff --git a/net/netfilter/xt_mac.c b/net/netfilter/xt_mac.c
index f4defa2..b3e96a0 100644 (file)
--- a/net/netfilter/xt_mac.c
+++ b/net/netfilter/xt_mac.c
@@ -14,73 +14,63 @@
 #include <linux/etherdevice.h>
 
 #include <linux/netfilter_ipv4.h>
+#include <linux/netfilter_ipv6.h>
 #include <linux/netfilter/xt_mac.h>
 #include <linux/netfilter/x_tables.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
-MODULE_DESCRIPTION("iptables mac matching module");
+MODULE_DESCRIPTION("Xtables: MAC address match");
 MODULE_ALIAS("ipt_mac");
 MODULE_ALIAS("ip6t_mac");
 
-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,
-      int *hotdrop)
+static bool
+mac_mt(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, bool *hotdrop)
 {
     const struct xt_mac_info *info = matchinfo;
 
     /* Is mac pointer valid? */
-    return (skb->mac.raw >= skb->head
-           && (skb->mac.raw + ETH_HLEN) <= skb->data
-           /* If so, compare... */
-           && ((!compare_ether_addr(eth_hdr(skb)->h_source, info->srcaddr))
-               ^ info->invert));
+    return skb_mac_header(skb) >= skb->head &&
+          skb_mac_header(skb) + ETH_HLEN <= skb->data
+          /* If so, compare... */
+          && ((!compare_ether_addr(eth_hdr(skb)->h_source, info->srcaddr))
+               ^ info->invert);
 }
 
-static struct xt_match mac_match = {
-       .name           = "mac",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_mac_info),
-       .hooks          = (1 << NF_IP_PRE_ROUTING) | (1 << NF_IP_LOCAL_IN) |
-                         (1 << NF_IP_FORWARD),
-       .family         = AF_INET,
-       .me             = THIS_MODULE,
-};
-static struct xt_match mac6_match = {
-       .name           = "mac",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_mac_info),
-       .hooks          = (1 << NF_IP_PRE_ROUTING) | (1 << NF_IP_LOCAL_IN) |
-                         (1 << NF_IP_FORWARD),
-       .family         = AF_INET6,
-       .me             = THIS_MODULE,
+static struct xt_match mac_mt_reg[] __read_mostly = {
+       {
+               .name           = "mac",
+               .family         = AF_INET,
+               .match          = mac_mt,
+               .matchsize      = sizeof(struct xt_mac_info),
+               .hooks          = (1 << NF_INET_PRE_ROUTING) |
+                                 (1 << NF_INET_LOCAL_IN) |
+                                 (1 << NF_INET_FORWARD),
+               .me             = THIS_MODULE,
+       },
+       {
+               .name           = "mac",
+               .family         = AF_INET6,
+               .match          = mac_mt,
+               .matchsize      = sizeof(struct xt_mac_info),
+               .hooks          = (1 << NF_INET_PRE_ROUTING) |
+                                 (1 << NF_INET_LOCAL_IN) |
+                                 (1 << NF_INET_FORWARD),
+               .me             = THIS_MODULE,
+       },
 };
 
-static int __init init(void)
+static int __init mac_mt_init(void)
 {
-       int ret;
-       ret = xt_register_match(&mac_match);
-       if (ret)
-               return ret;
-
-       ret = xt_register_match(&mac6_match);
-       if (ret)
-               xt_unregister_match(&mac_match);
-
-       return ret;
+       return xt_register_matches(mac_mt_reg, ARRAY_SIZE(mac_mt_reg));
 }
 
-static void __exit fini(void)
+static void __exit mac_mt_exit(void)
 {
-       xt_unregister_match(&mac_match);
-       xt_unregister_match(&mac6_match);
+       xt_unregister_matches(mac_mt_reg, ARRAY_SIZE(mac_mt_reg));
 }
 
-module_init(init);
-module_exit(fini);
+module_init(mac_mt_init);
+module_exit(mac_mt_exit);