From 1216ca541f9719c828153f157de4ff4d5f16bd72 Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Oct 20 2023 21:26:29 +0000 Subject: Import openvswitch2.17-2.17.0-131 from Fast DataPath --- diff --git a/SOURCES/openvswitch-2.17.0.patch b/SOURCES/openvswitch-2.17.0.patch index 69cc08f..6baf51c 100644 --- a/SOURCES/openvswitch-2.17.0.patch +++ b/SOURCES/openvswitch-2.17.0.patch @@ -52802,6 +52802,26 @@ index 34d45b82a1..31db2d2c7c 100644 /* Throttle restarts to no more than once every 10 seconds. */ if (time(NULL) < last_restart + 10) { +diff --git a/lib/db-ctl-base.c b/lib/db-ctl-base.c +index 7074561588..28a9dbb60e 100644 +--- a/lib/db-ctl-base.c ++++ b/lib/db-ctl-base.c +@@ -820,6 +820,7 @@ check_condition(const struct ovsdb_idl_table_class *table, + type.value.type = OVSDB_TYPE_VOID; + error = ovsdb_datum_from_string(&b, &type, value_string, symtab); + if (error) { ++ ovsdb_atom_destroy(&want_key, column->type.key.type); + goto out; + } + +@@ -1368,6 +1369,7 @@ set_column(const struct ovsdb_idl_table_class *table, + error = ovsdb_atom_from_string(&value, NULL, &column->type.value, + value_string, symtab); + if (error) { ++ ovsdb_atom_destroy(&key, column->type.key.type); + goto out; + } + diff --git a/lib/dhparams.c b/lib/dhparams.c index 85123863fc..50209d5d81 100644 --- a/lib/dhparams.c diff --git a/SPECS/openvswitch2.17.spec b/SPECS/openvswitch2.17.spec index bcc2be3..15c69cd 100644 --- a/SPECS/openvswitch2.17.spec +++ b/SPECS/openvswitch2.17.spec @@ -63,7 +63,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.17.0 -Release: 130%{?dist} +Release: 131%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -749,6 +749,12 @@ exit 0 %endif %changelog +* Fri Oct 20 2023 Open vSwitch CI - 2.17.0-131 +- Merging upstream branch-2.17 [RH git: 06fdaf813f] + Commit list: + 48fa547473 db-ctl-base: Fix memory leak of db commands. + + * Wed Oct 18 2023 Open vSwitch CI - 2.17.0-130 - Merging upstream branch-2.17 [RH git: 73a70edb2a] Commit list: