diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch index de42328..d87d367 100644 --- a/SOURCES/openvswitch-2.13.0.patch +++ b/SOURCES/openvswitch-2.13.0.patch @@ -86105,7 +86105,7 @@ index 4407f9c97a..3cfb6bf8d6 100644 &ctx.xbridge->ofproto->up); } diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c -index d3cb392077..12a1d3ca7e 100644 +index d3cb392077..b214914d41 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -1381,6 +1381,24 @@ check_ct_timeout_policy(struct dpif_backer *backer) @@ -86158,6 +86158,14 @@ index d3cb392077..12a1d3ca7e 100644 } /* Gets timeout policy name in 'backer' based on 'zone', 'dl_type' and +@@ -6335,6 +6357,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 c9d5df34b0..4d1f126910 100644 --- a/ofproto/ofproto-dpif.h diff --git a/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec index dde6366..fa0befe 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: 142%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} +Release: 143%{?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 @@ -712,6 +712,12 @@ exit 0 %endif %changelog +* Mon Jan 17 2022 Open vSwitch CI - 2.13.0-143 +- Merging upstream branch-2.13 [RH git: 52b03eee18] + Commit list: + d30d561bd9 ofproto-dpif: Fix memory leak in dpif/show-dp-features appctl. + + * Sat Dec 18 2021 Open vSwitch CI - 2.13.0-142 - Merging upstream branch-2.13 [RH git: e2ae994435] Commit list: