From de298207bfbcf8961831795d5c600c0ce30a7fb0 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Feb 17 2022 17:37:17 +0000
Subject: Import openvswitch2.13-2.13.0-160 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch
index f1512c0..d0809fe 100644
--- a/SOURCES/openvswitch-2.13.0.patch
+++ b/SOURCES/openvswitch-2.13.0.patch
@@ -85180,7 +85180,7 @@ index 30d1d08eba..00497d940c 100644
  
  struct ovsdb_idl_class {
 diff --git a/lib/ovsdb-idl.c b/lib/ovsdb-idl.c
-index 190143f363..ba73ea8d63 100644
+index 190143f363..a4b1659d19 100644
 --- a/lib/ovsdb-idl.c
 +++ b/lib/ovsdb-idl.c
 @@ -219,9 +219,12 @@ struct ovsdb_idl_db {
@@ -85927,12 +85927,11 @@ index 190143f363..ba73ea8d63 100644
      return row;
  }
  
-@@ -5323,6 +5592,10 @@ void
+@@ -5323,6 +5592,9 @@ void
  ovsdb_idl_loop_destroy(struct ovsdb_idl_loop *loop)
  {
      if (loop) {
 +        if (loop->committing_txn) {
-+            ovsdb_idl_txn_abort(loop->committing_txn);
 +            ovsdb_idl_txn_destroy(loop->committing_txn);
 +        }
          ovsdb_idl_destroy(loop->idl);
diff --git a/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec
index e8cb3f1..86e3c4b 100644
--- a/SPECS/openvswitch2.13.spec
+++ b/SPECS/openvswitch2.13.spec
@@ -59,7 +59,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.13.0
-Release: 159%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist}
+Release: 160%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -715,6 +715,12 @@ exit 0
 %endif
 
 %changelog
+* Thu Feb 17 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-160
+- Merging upstream branch-2.13 [RH git: e141303891]
+    Commit list:
+    cdac9619af ovsdb-idl: Fix use-after-free when destroying an IDL loop.
+
+
 * Tue Feb 15 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-159
 - Merging upstream branch-2.13 [RH git: df7530e646]
     Commit list: