openvswitch: Free tmpl with tmpl_free.
authorJoe Stringer <joe@ovn.org>
Fri, 2 Sep 2016 01:01:47 +0000 (18:01 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 4 Sep 2016 18:38:10 +0000 (11:38 -0700)
When an error occurs during conntrack template creation as part of
actions validation, we need to free the template. Previously we've been
using nf_ct_put() to do this, but nf_ct_tmpl_free() is more appropriate.

Signed-off-by: Joe Stringer <joe@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/openvswitch/conntrack.c

index e054a748ff2502f2d1a63b61056c64a6aa24059e..31045ef44a82b925e53ce34da2aca74448dd9c8d 100644 (file)
@@ -1367,7 +1367,7 @@ static void __ovs_ct_free_action(struct ovs_conntrack_info *ct_info)
        if (ct_info->helper)
                module_put(ct_info->helper->me);
        if (ct_info->ct)
-               nf_ct_put(ct_info->ct);
+               nf_ct_tmpl_free(ct_info->ct);
 }
 
 void ovs_ct_init(struct net *net)