netfilter: nf_conntrack: push zone object into functions

This patch replaces the zone id which is pushed down into functions
with the actual zone object. It's a bigger one-time change, but
needed for later on extending zones with a direction parameter, and
thus decoupling this additional information from all call-sites.

No functional changes in this patch.

The default zone becomes a global const object, namely nf_ct_zone_dflt
and will be returned directly in various cases, one being, when there's
f.e. no zoning support.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

1 files changed, 4 insertions, 1 deletions

diff --git a/net/sched/act_connmark.c b/net/sched/act_connmark.c
index f2b540220ad0..e67a1bdd0929 100644
--- a/net/sched/act_connmark.c
+++ b/net/sched/act_connmark.c
@@ -37,6 +37,7 @@ static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a,
         struct nf_conntrack_tuple tuple;
         enum ip_conntrack_info ctinfo;
         struct tcf_connmark_info *ca = a->priv;
+        struct nf_conntrack_zone zone;
         struct nf_conn *c;
         int proto;
 
@@ -70,7 +71,9 @@ static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a,
                                proto, &tuple))
                 goto out;
 
-        thash = nf_conntrack_find_get(dev_net(skb->dev), ca->zone, &tuple);
+        zone.id = ca->zone;
+
+        thash = nf_conntrack_find_get(dev_net(skb->dev), &zone, &tuple);
         if (!thash)
                 goto out;