diff --git a/SOURCES/openvswitch-2.17.0.patch b/SOURCES/openvswitch-2.17.0.patch index 4cc3d10..4ec8902 100644 --- a/SOURCES/openvswitch-2.17.0.patch +++ b/SOURCES/openvswitch-2.17.0.patch @@ -98574,6 +98574,18 @@ index 9f35713ef5..6ef23ed5c3 100644 dpif_netdev_init, dpif_netdev_enumerate, dpif_netdev_port_open_type, +diff --git a/lib/dpif-netlink-rtnl.c b/lib/dpif-netlink-rtnl.c +index 4fc42daed2..4090efcd85 100644 +--- a/lib/dpif-netlink-rtnl.c ++++ b/lib/dpif-netlink-rtnl.c +@@ -561,6 +561,7 @@ dpif_netlink_rtnl_probe_oot_tunnels(void) + + tnl_cfg = netdev_get_tunnel_config(netdev); + if (!tnl_cfg) { ++ netdev_close(netdev); + return true; + } + diff --git a/lib/dpif-netlink.c b/lib/dpif-netlink.c index 71e35ccdda..6f2c7bc902 100644 --- a/lib/dpif-netlink.c diff --git a/SPECS/openvswitch2.17.spec b/SPECS/openvswitch2.17.spec index f098845..fdc0a2a 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: 179%{?dist} +Release: 180%{?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 +* Wed Jul 17 2024 Open vSwitch CI - 2.17.0-180 +- Merging upstream branch-2.17 [RH git: e29ea78333] + Commit list: + f3d5ce5fad dpif-netlink-rtnl: Fix netdev leak in out-of-tree tunnels probe. + + * Wed Jul 17 2024 Open vSwitch CI - 2.17.0-179 - Merging upstream branch-2.17 [RH git: 7be512ae9b] Commit list: