[ovs-dev] [PATCH] datapath: Revert "datapath: Fix template leak in error cases."

[Yifeng Sun]

The more appropriate patch (7664423) mentioned in the revert message
was introduced in ovs-2.5.
So I think this revert patch should be backported to 2.5.

Thanks,
Yifeng

On Mon, Apr 15, 2019 at 4:08 PM Ben Pfaff <blp at ovn.org> wrote:
>
> On Wed, Apr 03, 2019 at 03:34:34PM -0300, Flavio Leitner via dev wrote:
> > On Wed, Apr 03, 2019 at 09:49:13AM -0700, Yifeng Sun wrote:
> > > From: Flavio Leitner <fbl at redhat.com>
> > >
> > > Upstream commit:
> > >     commit 7f6d6558ae44bc193eb28df3617c364d3bb6df39
> > >     Author: Flavio Leitner <fbl at redhat.com>
> > >     Date:   Fri Sep 28 14:55:34 2018 -0300
> > >
> > >     Revert "openvswitch: Fix template leak in error cases."
> > >     This reverts commit 90c7afc.
> > >
> > >     When the commit was merged, the code used nf_ct_put() to free
> > >     the entry, but later on commit 7664423 ("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 44d6e2f ("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 <fbl at redhat.com>
> > >     Acked-by: Joe Stringer <joe at ovn.org>
> > >     Signed-off-by: David S. Miller <davem at davemloft.net>
> > >
> > > This patch backports this upstream patch to OVS.
> > >
> > > Cc: Flavio Leitner <fbl at redhat.com>
> > > Signed-off-by: Yifeng Sun <pkusunyifeng at gmail.com>
> > > ---
> >
> > LGTM
> > Acked-by: Flavio Leitner <fbl at sysclose.org>
>
> I applied this to master.  I would appreciate advice on backporting.