diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch index 8764e97..b7b9fb2 100644 --- a/SOURCES/openvswitch-2.15.0.patch +++ b/SOURCES/openvswitch-2.15.0.patch @@ -21595,7 +21595,7 @@ index 7108c8a301..8606d584be 100644 } } diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c -index fd0b2fdea0..5ce56adfae 100644 +index fd0b2fdea0..29d8bb4947 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -1389,6 +1389,24 @@ check_ct_timeout_policy(struct dpif_backer *backer) @@ -21651,6 +21651,14 @@ index fd0b2fdea0..5ce56adfae 100644 } /* Gets timeout policy name in 'backer' based on 'zone', 'dl_type' and +@@ -6375,6 +6397,7 @@ ofproto_unixctl_dpif_show_dp_features(struct unixctl_conn *conn, + + dpif_show_support(&ofproto->backer->bt_support, &ds); + unixctl_command_reply(conn, ds_cstr(&ds)); ++ ds_destroy(&ds); + } + + static void diff --git a/ofproto/ofproto-dpif.h b/ofproto/ofproto-dpif.h index b41c3d82ad..191cfcb0df 100644 --- a/ofproto/ofproto-dpif.h diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec index 26f546b..534afc7 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: 56%{?dist} +Release: 57%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -699,6 +699,12 @@ exit 0 %endif %changelog +* Mon Jan 17 2022 Open vSwitch CI - 2.15.0-57 +- Merging upstream branch-2.15 [RH git: 228a38c3dc] + Commit list: + a7dc6af0fc ofproto-dpif: Fix memory leak in dpif/show-dp-features appctl. + + * Sat Dec 18 2021 Open vSwitch CI - 2.15.0-56 - Merging upstream branch-2.15 [RH git: 9504acc03d] Commit list: