[NETFILTER]: x_tables: don't use __copy_{from,to}_user on unchecked memory in compat...

[linux-2.6] / net / netfilter / nf_conntrack_netlink.c

diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index aef3cb41131fe7aa1827ebfbe0938fc8f233d6b0..bd10eb944b656aa5f91b807eee4a96a5c92fbf3e 100644 (file)
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -4,7 +4,7 @@
  * (C) 2001 by Jay Schulist <jschlst@samba.org>
  * (C) 2002-2006 by Harald Welte <laforge@gnumonks.org>
  * (C) 2003 by Patrick Mchardy <kaber@trash.net>
- * (C) 2005 by Pablo Neira Ayuso <pablo@eurodev.net>
+ * (C) 2005-2006 by Pablo Neira Ayuso <pablo@eurodev.net>
  *
  * I've reworked this stuff to use attributes instead of conntrack 
  * structures. 5.44 am. I need more tea. --pablo 05/07/11.
@@ -55,20 +55,18 @@ static char __initdata version[] = "0.93";
 
 static inline int
 ctnetlink_dump_tuples_proto(struct sk_buff *skb, 
-                           const struct nf_conntrack_tuple *tuple)
+                           const struct nf_conntrack_tuple *tuple,
+                           struct nf_conntrack_protocol *proto)
 {
-       struct nf_conntrack_protocol *proto;
        int ret = 0;
+       struct nfattr *nest_parms = NFA_NEST(skb, CTA_TUPLE_PROTO);
 
        NFA_PUT(skb, CTA_PROTO_NUM, sizeof(u_int8_t), &tuple->dst.protonum);
 
-       /* If no protocol helper is found, this function will return the
-        * generic protocol helper, so proto won't *ever* be NULL */
-       proto = nf_ct_proto_find_get(tuple->src.l3num, tuple->dst.protonum);
        if (likely(proto->tuple_to_nfattr))
                ret = proto->tuple_to_nfattr(skb, tuple);
        
-       nf_ct_proto_put(proto);
+       NFA_NEST_END(skb, nest_parms);
 
        return ret;
 
@@ -77,33 +75,44 @@ nfattr_failure:
 }
 
 static inline int
-ctnetlink_dump_tuples(struct sk_buff *skb, 
-                     const struct nf_conntrack_tuple *tuple)
+ctnetlink_dump_tuples_ip(struct sk_buff *skb,
+                        const struct nf_conntrack_tuple *tuple,
+                        struct nf_conntrack_l3proto *l3proto)
 {
-       struct nfattr *nest_parms;
-       struct nf_conntrack_l3proto *l3proto;
        int ret = 0;
-       
-       l3proto = nf_ct_l3proto_find_get(tuple->src.l3num);
-       
-       nest_parms = NFA_NEST(skb, CTA_TUPLE_IP);
+       struct nfattr *nest_parms = NFA_NEST(skb, CTA_TUPLE_IP);
+
        if (likely(l3proto->tuple_to_nfattr))
                ret = l3proto->tuple_to_nfattr(skb, tuple);
+
        NFA_NEST_END(skb, nest_parms);
 
+       return ret;
+
+nfattr_failure:
+       return -1;
+}
+
+static inline int
+ctnetlink_dump_tuples(struct sk_buff *skb,
+                     const struct nf_conntrack_tuple *tuple)
+{
+       int ret;
+       struct nf_conntrack_l3proto *l3proto;
+       struct nf_conntrack_protocol *proto;
+
+       l3proto = nf_ct_l3proto_find_get(tuple->src.l3num);
+       ret = ctnetlink_dump_tuples_ip(skb, tuple, l3proto);
        nf_ct_l3proto_put(l3proto);
 
        if (unlikely(ret < 0))
                return ret;
 
-       nest_parms = NFA_NEST(skb, CTA_TUPLE_PROTO);
-       ret = ctnetlink_dump_tuples_proto(skb, tuple);
-       NFA_NEST_END(skb, nest_parms);
+       proto = nf_ct_proto_find_get(tuple->src.l3num, tuple->dst.protonum);
+       ret = ctnetlink_dump_tuples_proto(skb, tuple, proto);
+       nf_ct_proto_put(proto);
 
        return ret;
-
-nfattr_failure:
-       return -1;
 }
 
 static inline int
@@ -338,9 +347,10 @@ static int ctnetlink_conntrack_event(struct notifier_block *this,
                group = NFNLGRP_CONNTRACK_UPDATE;
        } else
                return NOTIFY_DONE;
-       
-  /* FIXME: Check if there are any listeners before, don't hurt performance */
-       
+
+       if (!nfnetlink_has_listeners(group))
+               return NOTIFY_DONE;
+
        skb = alloc_skb(NLMSG_GOODSIZE, GFP_ATOMIC);
        if (!skb)
                return NOTIFY_DONE;
@@ -1012,7 +1022,7 @@ ctnetlink_change_conntrack(struct nf_conn *ct, struct nfattr *cda[])
                        return err;
        }
 
-#if defined(CONFIG_IP_NF_CONNTRACK_MARK)
+#if defined(CONFIG_NF_CONNTRACK_MARK)
        if (cda[CTA_MARK-1])
                ct->mark = ntohl(*(u_int32_t *)NFA_DATA(cda[CTA_MARK-1]));
 #endif
@@ -1052,7 +1062,7 @@ ctnetlink_create_conntrack(struct nfattr *cda[],
                        return err;
        }
 
-#if defined(CONFIG_IP_NF_CONNTRACK_MARK)
+#if defined(CONFIG_NF_CONNTRACK_MARK)
        if (cda[CTA_MARK-1])
                ct->mark = ntohl(*(u_int32_t *)NFA_DATA(cda[CTA_MARK-1]));
 #endif
@@ -1151,6 +1161,37 @@ nfattr_failure:
        return -1;
 }                      
 
+static inline int
+ctnetlink_exp_dump_mask(struct sk_buff *skb,
+                       const struct nf_conntrack_tuple *tuple,
+                       const struct nf_conntrack_tuple *mask)
+{
+       int ret;
+       struct nf_conntrack_l3proto *l3proto;
+       struct nf_conntrack_protocol *proto;
+       struct nfattr *nest_parms = NFA_NEST(skb, CTA_EXPECT_MASK);
+
+       l3proto = nf_ct_l3proto_find_get(tuple->src.l3num);
+       ret = ctnetlink_dump_tuples_ip(skb, mask, l3proto);
+       nf_ct_l3proto_put(l3proto);
+
+       if (unlikely(ret < 0))
+               goto nfattr_failure;
+
+       proto = nf_ct_proto_find_get(tuple->src.l3num, tuple->dst.protonum);
+       ret = ctnetlink_dump_tuples_proto(skb, mask, proto);
+       nf_ct_proto_put(proto);
+       if (unlikely(ret < 0))
+               goto nfattr_failure;
+
+       NFA_NEST_END(skb, nest_parms);
+
+       return 0;
+
+nfattr_failure:
+       return -1;
+}
+
 static inline int
 ctnetlink_exp_dump_expect(struct sk_buff *skb,
                           const struct nf_conntrack_expect *exp)
@@ -1161,7 +1202,7 @@ ctnetlink_exp_dump_expect(struct sk_buff *skb,
 
        if (ctnetlink_exp_dump_tuple(skb, &exp->tuple, CTA_EXPECT_TUPLE) < 0)
                goto nfattr_failure;
-       if (ctnetlink_exp_dump_tuple(skb, &exp->mask, CTA_EXPECT_MASK) < 0)
+       if (ctnetlink_exp_dump_mask(skb, &exp->tuple, &exp->mask) < 0)
                goto nfattr_failure;
        if (ctnetlink_exp_dump_tuple(skb,
                                 &master->tuplehash[IP_CT_DIR_ORIGINAL].tuple,
@@ -1646,7 +1687,7 @@ static void __exit ctnetlink_exit(void)
        printk("ctnetlink: unregistering from nfnetlink.\n");
 
 #ifdef CONFIG_NF_CONNTRACK_EVENTS
-       nf_conntrack_unregister_notifier(&ctnl_notifier_exp);
+       nf_conntrack_expect_unregister_notifier(&ctnl_notifier_exp);
        nf_conntrack_unregister_notifier(&ctnl_notifier);
 #endif