From a2fe91a93ba79a1b2f29d9657ee34a1823661969 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Feb 17 2022 07:42:58 +0000
Subject: Import openvswitch2.15-2.15.0-75 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch
index 9026005..21b477e 100644
--- a/SOURCES/openvswitch-2.15.0.patch
+++ b/SOURCES/openvswitch-2.15.0.patch
@@ -21553,7 +21553,7 @@ index ff8adaefb5..249cff0512 100644
              struct ovsdb_error *error = ovsdb_syntax_error(
                  result, NULL, "bad monitor_cond_since reply format");
 diff --git a/lib/ovsdb-idl.c b/lib/ovsdb-idl.c
-index 2c8a0c9cfe..f54bc68f7b 100644
+index 2c8a0c9cfe..bebe9d18ba 100644
 --- a/lib/ovsdb-idl.c
 +++ b/lib/ovsdb-idl.c
 @@ -92,6 +92,9 @@ struct ovsdb_idl {
@@ -21848,18 +21848,17 @@ index 2c8a0c9cfe..f54bc68f7b 100644
  }
  
  /* Returns true if a column with mode OVSDB_IDL_MODE_RW changed, false
-@@ -4035,6 +4112,10 @@ void
+@@ -4035,6 +4112,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);
      }
  }
-@@ -4044,8 +4125,8 @@ ovsdb_idl_loop_run(struct ovsdb_idl_loop *loop)
+@@ -4044,8 +4124,8 @@ ovsdb_idl_loop_run(struct ovsdb_idl_loop *loop)
  {
      ovsdb_idl_run(loop->idl);
  
diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec
index c5043d7..8178491 100644
--- a/SPECS/openvswitch2.15.spec
+++ b/SPECS/openvswitch2.15.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.15.0
-Release: 74%{?dist}
+Release: 75%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -702,6 +702,12 @@ exit 0
 %endif
 
 %changelog
+* Wed Feb 16 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-75
+- Merging upstream branch-2.15 [RH git: a01913de4d]
+    Commit list:
+    8a60afaa00 ovsdb-idl: Fix use-after-free when destroying an IDL loop.
+
+
 * Tue Feb 15 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-74
 - Merging upstream branch-2.15 [RH git: 84306060e6]
     Commit list: