Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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

diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 30c9d4ca02180e050d3b98c8480b83dfc71047b9..04fb409623d222182828b54cd675a7c67e77bc1e 100644 (file)
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -691,9 +691,18 @@ static int ctnetlink_done(struct netlink_callback *cb)
 {
        if (cb->args[1])
                nf_ct_put((struct nf_conn *)cb->args[1]);
+       if (cb->data)
+               kfree(cb->data);
        return 0;
 }
 
+struct ctnetlink_dump_filter {
+       struct {
+               u_int32_t val;
+               u_int32_t mask;
+       } mark;
+};
+
 static int
 ctnetlink_dump_table(struct sk_buff *skb, struct netlink_callback *cb)
 {
@@ -703,7 +712,9 @@ ctnetlink_dump_table(struct sk_buff *skb, struct netlink_callback *cb)
        struct hlist_nulls_node *n;
        struct nfgenmsg *nfmsg = nlmsg_data(cb->nlh);
        u_int8_t l3proto = nfmsg->nfgen_family;
-
+#ifdef CONFIG_NF_CONNTRACK_MARK
+       const struct ctnetlink_dump_filter *filter = cb->data;
+#endif
        spin_lock_bh(&nf_conntrack_lock);
        last = (struct nf_conn *)cb->args[1];
        for (; cb->args[0] < net->ct.htable_size; cb->args[0]++) {
@@ -723,6 +734,12 @@ restart:
                                        continue;
                                cb->args[1] = 0;
                        }
+#ifdef CONFIG_NF_CONNTRACK_MARK
+                       if (filter && !((ct->mark & filter->mark.mask) ==
+                                       filter->mark.val)) {
+                               continue;
+                       }
+#endif
                        if (ctnetlink_fill_info(skb, NETLINK_CB(cb->skb).pid,
                                                cb->nlh->nlmsg_seq,
                                                NFNL_MSG_TYPE(
@@ -894,6 +911,7 @@ static const struct nla_policy ct_nla_policy[CTA_MAX+1] = {
        [CTA_NAT_DST]           = { .type = NLA_NESTED },
        [CTA_TUPLE_MASTER]      = { .type = NLA_NESTED },
        [CTA_ZONE]              = { .type = NLA_U16 },
+       [CTA_MARK_MASK]         = { .type = NLA_U32 },
 };
 
 static int
@@ -977,9 +995,28 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb,
        u16 zone;
        int err;
 
-       if (nlh->nlmsg_flags & NLM_F_DUMP)
-               return netlink_dump_start(ctnl, skb, nlh, ctnetlink_dump_table,
-                                         ctnetlink_done, 0);
+       if (nlh->nlmsg_flags & NLM_F_DUMP) {
+               struct netlink_dump_control c = {
+                       .dump = ctnetlink_dump_table,
+                       .done = ctnetlink_done,
+               };
+#ifdef CONFIG_NF_CONNTRACK_MARK
+               if (cda[CTA_MARK] && cda[CTA_MARK_MASK]) {
+                       struct ctnetlink_dump_filter *filter;
+
+                       filter = kzalloc(sizeof(struct ctnetlink_dump_filter),
+                                        GFP_ATOMIC);
+                       if (filter == NULL)
+                               return -ENOMEM;
+
+                       filter->mark.val = ntohl(nla_get_be32(cda[CTA_MARK]));
+                       filter->mark.mask =
+                               ntohl(nla_get_be32(cda[CTA_MARK_MASK]));
+                       c.data = filter;
+               }
+#endif
+               return netlink_dump_start(ctnl, skb, nlh, &c);
+       }
 
        err = ctnetlink_parse_zone(cda[CTA_ZONE], &zone);
        if (err < 0)
@@ -1836,9 +1873,11 @@ ctnetlink_get_expect(struct sock *ctnl, struct sk_buff *skb,
        int err;
 
        if (nlh->nlmsg_flags & NLM_F_DUMP) {
-               return netlink_dump_start(ctnl, skb, nlh,
-                                         ctnetlink_exp_dump_table,
-                                         ctnetlink_exp_done, 0);
+               struct netlink_dump_control c = {
+                       .dump = ctnetlink_exp_dump_table,
+                       .done = ctnetlink_exp_done,
+               };
+               return netlink_dump_start(ctnl, skb, nlh, &c);
        }
 
        err = ctnetlink_parse_zone(cda[CTA_EXPECT_ZONE], &zone);