Re: [ovs-dev] [PATCH] datapath: Revert "datapath: Fix template leak in error cases."
OK, I backported as far as 2.6. On 2.5, the original patch hadn't been
applied, so there was nothing to revert.
On Tue, Apr 16, 2019 at 11:12:11AM -0700, Yifeng Sun wrote:
> 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 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
> > > >
> > > > Upstream commit:
> > > > commit 7f6d6558ae44bc193eb28df3617c364d3bb6df39
> > > > Author: Flavio Leitner
> > > > 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
> > > > Acked-by: Joe Stringer
> > > > Signed-off-by: David S. Miller
> > > >
> > > > This patch backports this upstream patch to OVS.
> > > >
> > > > Cc: Flavio Leitner
> > > > Signed-off-by: Yifeng Sun
> > > > ---
> > >
> > > LGTM
> > > Acked-by: Flavio Leitner
> >
> > I applied this to master. I would appreciate advice on backporting.
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Re: [ovs-dev] [PATCH] datapath: Revert "datapath: Fix template leak in error cases."
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 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
> > >
> > > Upstream commit:
> > > commit 7f6d6558ae44bc193eb28df3617c364d3bb6df39
> > > Author: Flavio Leitner
> > > 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
> > > Acked-by: Joe Stringer
> > > Signed-off-by: David S. Miller
> > >
> > > This patch backports this upstream patch to OVS.
> > >
> > > Cc: Flavio Leitner
> > > Signed-off-by: Yifeng Sun
> > > ---
> >
> > LGTM
> > Acked-by: Flavio Leitner
>
> I applied this to master. I would appreciate advice on backporting.
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Re: [ovs-dev] [PATCH] datapath: Revert "datapath: Fix template leak in error cases."
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
> >
> > Upstream commit:
> > commit 7f6d6558ae44bc193eb28df3617c364d3bb6df39
> > Author: Flavio Leitner
> > 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
> > Acked-by: Joe Stringer
> > Signed-off-by: David S. Miller
> >
> > This patch backports this upstream patch to OVS.
> >
> > Cc: Flavio Leitner
> > Signed-off-by: Yifeng Sun
> > ---
>
> LGTM
> Acked-by: Flavio Leitner
I applied this to master. I would appreciate advice on backporting.
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Re: [ovs-dev] [PATCH] datapath: Revert "datapath: Fix template leak in error cases."
On Wed, Apr 03, 2019 at 09:49:13AM -0700, Yifeng Sun wrote:
> From: Flavio Leitner
>
> Upstream commit:
> commit 7f6d6558ae44bc193eb28df3617c364d3bb6df39
> Author: Flavio Leitner
> 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
> Acked-by: Joe Stringer
> Signed-off-by: David S. Miller
>
> This patch backports this upstream patch to OVS.
>
> Cc: Flavio Leitner
> Signed-off-by: Yifeng Sun
> ---
LGTM
Acked-by: Flavio Leitner
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
[ovs-dev] [PATCH] datapath: Revert "datapath: Fix template leak in error cases."
From: Flavio Leitner
Upstream commit:
commit 7f6d6558ae44bc193eb28df3617c364d3bb6df39
Author: Flavio Leitner
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
Acked-by: Joe Stringer
Signed-off-by: David S. Miller
This patch backports this upstream patch to OVS.
Cc: Flavio Leitner
Signed-off-by: Yifeng Sun
---
datapath/conntrack.c | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/datapath/conntrack.c b/datapath/conntrack.c
index a7dc9e0c3513..52208bad3029 100644
--- a/datapath/conntrack.c
+++ b/datapath/conntrack.c
@@ -1691,10 +1691,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, _info.ct->status);
- nf_conntrack_get(_info.ct->ct_general);
-
if (helper) {
err = ovs_ct_add_helper(_info, helper, key, log);
if (err)
@@ -1706,6 +1702,8 @@ int ovs_ct_copy_action(struct net *net, const struct
nlattr *attr,
if (err)
goto err_free_ct;
+ __set_bit(IPS_CONFIRMED_BIT, _info.ct->status);
+ nf_conntrack_get(_info.ct->ct_general);
return 0;
err_free_ct:
__ovs_ct_free_action(_info);
--
2.7.4
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
