diff --git a/SOURCES/openvswitch-3.2.0.patch b/SOURCES/openvswitch-3.2.0.patch index 73a775d..609c490 100644 --- a/SOURCES/openvswitch-3.2.0.patch +++ b/SOURCES/openvswitch-3.2.0.patch @@ -2773,9 +2773,19 @@ index 5d2635946d..3a8068b12c 100644 } diff --git a/lib/dpctl.c b/lib/dpctl.c -index 79b82a1767..b0ee5734f4 100644 +index 79b82a1767..a63169b177 100644 --- a/lib/dpctl.c +++ b/lib/dpctl.c +@@ -726,8 +726,8 @@ show_dpif(struct dpif *dpif, struct dpctl_params *dpctl_p) + continue; + } + error = netdev_get_stats(netdev, &s); ++ netdev_close(netdev); + if (!error) { +- netdev_close(netdev); + print_stat(dpctl_p, " RX packets:", s.rx_packets); + print_stat(dpctl_p, " errors:", s.rx_errors); + print_stat(dpctl_p, " dropped:", s.rx_dropped); @@ -1347,19 +1347,17 @@ static int dpctl_del_flow_dpif(struct dpif *dpif, const char *key_s, struct dpctl_params *dpctl_p) diff --git a/SPECS/openvswitch3.2.spec b/SPECS/openvswitch3.2.spec index db84a68..b6186b1 100644 --- a/SPECS/openvswitch3.2.spec +++ b/SPECS/openvswitch3.2.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.2.0 -Release: 91%{?dist} +Release: 92%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -761,6 +761,12 @@ exit 0 %endif %changelog +* Wed Jul 17 2024 Open vSwitch CI - 3.2.0-92 +- Merging upstream branch-3.2 [RH git: 3544c84760] + Commit list: + 8c1eca08fa dpctl: Fix netdev reference leak in "show" command. + + * Wed Jul 17 2024 Open vSwitch CI - 3.2.0-91 - Merging upstream branch-3.2 [RH git: 331c590dbc] Commit list: