From patchwork Fri Sep 28 17:55:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Flavio Leitner X-Patchwork-Id: 976423 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42MK960vFcz9s3x for ; Sat, 29 Sep 2018 03:55:54 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726665AbeI2AUp (ORCPT ); Fri, 28 Sep 2018 20:20:45 -0400 Received: from mail-qt1-f195.google.com ([209.85.160.195]:44428 "EHLO mail-qt1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726100AbeI2AUp (ORCPT ); Fri, 28 Sep 2018 20:20:45 -0400 Received: by mail-qt1-f195.google.com with SMTP id c56-v6so2668613qtd.11 for ; Fri, 28 Sep 2018 10:55:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=1YTkClKyuJn0ZZrpLgpquSIX96VUUYotqlKDgb7PA+I=; b=HCad5yTvzYK0y2Ffkw4Fre/qUh0ZSVQZfMM0MIPHtSs1CQ+JZQj3agDYZMlKKjHCGG a8iRbBHGWytwEHnD8utP9MXfC+l5CBQP+sqI5qP5KZz/a0NtguMe63LzfU+5nR8FpL9J giwburTh4fcP7lU8SuREol9WBqhdJLzd5NWkCWW896WzVjL+gcVb7lAM93PdI3BoFB17 0jyoGpO/ZVJu4O4eeReloaOV1/eDNSZlySkl0+EI16zfE8razO0cNp7kSrpO/+d7UESW 93byFRWVVuaDYIP+Fjnw1AK8AE7DOHgB5NOr6x5/7UzS4fpxrSJiYQe2EPG1OZx5hwM1 u5zA== X-Gm-Message-State: ABuFfogmBISEr0rj2tzZPpd9Wxn/l3GdqeHpWXezjjvj8H76EBULL6Et xU2GNP2StSg5mWgAp0BagmVtfQ== X-Google-Smtp-Source: ACcGV61JHYQopNbE9KEcNYygAL+DTsp9ngKShz3um8mQhmseXFXDF+IoExmrzhKba1SV/BVQpeQ3DQ== X-Received: by 2002:aed:3f08:: with SMTP id p8-v6mr13124810qtf.185.1538157350661; Fri, 28 Sep 2018 10:55:50 -0700 (PDT) Received: from localhost ([177.183.215.101]) by smtp.gmail.com with ESMTPSA id c50-v6sm4038871qtb.8.2018.09.28.10.55.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 28 Sep 2018 10:55:50 -0700 (PDT) From: Flavio Leitner To: netfilter-devel@vger.kernel.org, netdev@vger.kernel.org, dev@openvswitch.org Cc: Pravin B Shelar , Joe Stringer , Flavio Leitner Subject: [PATCH] Revert "openvswitch: Fix template leak in error cases." Date: Fri, 28 Sep 2018 14:55:34 -0300 Message-Id: <20180928175534.13590-1-fbl@redhat.com> X-Mailer: git-send-email 2.14.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This reverts commit 90c7afc96cbbd77f44094b5b651261968e97de67. When the commit was merged, the code used nf_ct_put() to free the entry, but later on commit 76644232e612 ("openvswitch: Free tmpl with tmpl_free.") replaced that with nf_ct_tmpl_free which is a more appropriate. Now the original problem is removed. Then 44d6e2f27328 ("net: Replace NF_CT_ASSERT() with WARN_ON().") replaced a debug assert with a WARN_ON() which is trigged now. Signed-off-by: Flavio Leitner Acked-by: Joe Stringer --- net/openvswitch/conntrack.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c index 86a75105af1a..0aeb34c6389d 100644 --- a/net/openvswitch/conntrack.c +++ b/net/openvswitch/conntrack.c @@ -1624,10 +1624,6 @@ int ovs_ct_copy_action(struct net *net, const struct nlattr *attr, OVS_NLERR(log, "Failed to allocate conntrack template"); return -ENOMEM; } - - __set_bit(IPS_CONFIRMED_BIT, &ct_info.ct->status); - nf_conntrack_get(&ct_info.ct->ct_general); - if (helper) { err = ovs_ct_add_helper(&ct_info, helper, key, log); if (err) @@ -1639,6 +1635,8 @@ int ovs_ct_copy_action(struct net *net, const struct nlattr *attr, if (err) goto err_free_ct; + __set_bit(IPS_CONFIRMED_BIT, &ct_info.ct->status); + nf_conntrack_get(&ct_info.ct->ct_general); return 0; err_free_ct: __ovs_ct_free_action(&ct_info);