Home Home > GIT Browse > SLE12-SP4-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-02-20 12:35:52 +0100
committerTakashi Iwai <tiwai@suse.de>2019-02-20 12:35:59 +0100
commit5f9b897381b0ce5e0b44ada8c571f077849cdd47 (patch)
treec58468b427bfeaf7fb348220ebcc48562e815846
parent6f15474b239da521fba5cb015babad0dd5451139 (diff)
Revert "openvswitch: Fix template leak in error
cases." (bsc#1051510).
-rw-r--r--patches.fixes/Revert-openvswitch-Fix-template-leak-in-error-cases.patch54
-rw-r--r--series.conf1
2 files changed, 55 insertions, 0 deletions
diff --git a/patches.fixes/Revert-openvswitch-Fix-template-leak-in-error-cases.patch b/patches.fixes/Revert-openvswitch-Fix-template-leak-in-error-cases.patch
new file mode 100644
index 0000000000..4623625ccb
--- /dev/null
+++ b/patches.fixes/Revert-openvswitch-Fix-template-leak-in-error-cases.patch
@@ -0,0 +1,54 @@
+From 7f6d6558ae44bc193eb28df3617c364d3bb6df39 Mon Sep 17 00:00:00 2001
+From: Flavio Leitner <fbl@redhat.com>
+Date: Fri, 28 Sep 2018 14:55:34 -0300
+Subject: [PATCH] Revert "openvswitch: Fix template leak in error cases."
+Git-commit: 7f6d6558ae44bc193eb28df3617c364d3bb6df39
+Patch-mainline: v4.19-rc7
+References: bsc#1051510
+
+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 <fbl@redhat.com>
+Acked-by: Joe Stringer <joe@ovn.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ 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);
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 49e9545f87..32761c6ffc 100644
--- a/series.conf
+++ b/series.conf
@@ -18873,6 +18873,7 @@
patches.drivers/smsc95xx-Check-for-Wake-on-LAN-modes.patch
patches.drivers/qlcnic-fix-Tx-descriptor-corruption-on-82xx-devices.patch
patches.fixes/Bluetooth-SMP-fix-crash-in-unpairing.patch
+ patches.fixes/Revert-openvswitch-Fix-template-leak-in-error-cases.patch
patches.drivers/declance-Fix-continuation-with-the-adapter-identific.patch
patches.suse/inet-make-sure-to-grab-rcu_read_lock-before-using-ir.patch
patches.suse/bonding-fix-warning-message.patch