1 files changed, 11 insertions, 7 deletions

diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 72e63726efa0..ec0f8d9cee73 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -599,8 +599,8 @@ static int ovs_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info)
         if (IS_ERR(flow))
                 goto err_kfree_skb;
 
-        err = ovs_flow_key_extract_userspace(a[OVS_PACKET_ATTR_KEY], packet,
-                                             &flow->key, log);
+        err = ovs_flow_key_extract_userspace(net, a[OVS_PACKET_ATTR_KEY],
+                                             packet, &flow->key, log);
         if (err)
                 goto err_flow_free;
 
@@ -947,7 +947,7 @@ static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info)
 
         /* Extract key. */
         ovs_match_init(&match, &key, &mask);
-        error = ovs_nla_get_match(&match, a[OVS_FLOW_ATTR_KEY],
+        error = ovs_nla_get_match(net, &match, a[OVS_FLOW_ATTR_KEY],
                                   a[OVS_FLOW_ATTR_MASK], log);
         if (error)
                 goto err_kfree_flow;
@@ -1118,7 +1118,7 @@ static int ovs_flow_cmd_set(struct sk_buff *skb, struct genl_info *info)
 
         ufid_present = ovs_nla_get_ufid(&sfid, a[OVS_FLOW_ATTR_UFID], log);
         ovs_match_init(&match, &key, &mask);
-        error = ovs_nla_get_match(&match, a[OVS_FLOW_ATTR_KEY],
+        error = ovs_nla_get_match(net, &match, a[OVS_FLOW_ATTR_KEY],
                                   a[OVS_FLOW_ATTR_MASK], log);
         if (error)
                 goto error;
@@ -1208,6 +1208,7 @@ static int ovs_flow_cmd_get(struct sk_buff *skb, struct genl_info *info)
 {
         struct nlattr **a = info->attrs;
         struct ovs_header *ovs_header = info->userhdr;
+        struct net *net = sock_net(skb->sk);
         struct sw_flow_key key;
         struct sk_buff *reply;
         struct sw_flow *flow;
@@ -1222,7 +1223,7 @@ static int ovs_flow_cmd_get(struct sk_buff *skb, struct genl_info *info)
         ufid_present = ovs_nla_get_ufid(&ufid, a[OVS_FLOW_ATTR_UFID], log);
         if (a[OVS_FLOW_ATTR_KEY]) {
                 ovs_match_init(&match, &key, NULL);
-                err = ovs_nla_get_match(&match, a[OVS_FLOW_ATTR_KEY], NULL,
+                err = ovs_nla_get_match(net, &match, a[OVS_FLOW_ATTR_KEY], NULL,
                                         log);
         } else if (!ufid_present) {
                 OVS_NLERR(log,
@@ -1266,6 +1267,7 @@ static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info)
 {
         struct nlattr **a = info->attrs;
         struct ovs_header *ovs_header = info->userhdr;
+        struct net *net = sock_net(skb->sk);
         struct sw_flow_key key;
         struct sk_buff *reply;
         struct sw_flow *flow = NULL;
@@ -1280,8 +1282,8 @@ static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info)
         ufid_present = ovs_nla_get_ufid(&ufid, a[OVS_FLOW_ATTR_UFID], log);
         if (a[OVS_FLOW_ATTR_KEY]) {
                 ovs_match_init(&match, &key, NULL);
-                err = ovs_nla_get_match(&match, a[OVS_FLOW_ATTR_KEY], NULL,
-                                        log);
+                err = ovs_nla_get_match(net, &match, a[OVS_FLOW_ATTR_KEY],
+                                        NULL, log);
                 if (unlikely(err))
                         return err;
         }
@@ -2237,6 +2239,7 @@ static int __net_init ovs_init_net(struct net *net)
 
         INIT_LIST_HEAD(&ovs_net->dps);
         INIT_WORK(&ovs_net->dp_notify_work, ovs_dp_notify_wq);
+        ovs_ct_init(net);
         return 0;
 }
 
@@ -2271,6 +2274,7 @@ static void __net_exit ovs_exit_net(struct net *dnet)
         struct net *net;
         LIST_HEAD(head);
 
+        ovs_ct_exit(dnet);
         ovs_lock();
         list_for_each_entry_safe(dp, dp_next, &ovs_net->dps, list_node)
                 __dp_destroy(dp);