From bec80cd8facc1b6cfeb0c7611a52522148dc6210 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Feb 16 2021 07:42:01 +0000 Subject: import NetworkManager-1.26.0-13.el8_3 --- diff --git a/SOURCES/1024-device-clean-up-dispatcher-calls-rh1888348.patch b/SOURCES/1024-device-clean-up-dispatcher-calls-rh1888348.patch new file mode 100644 index 0000000..09a650c --- /dev/null +++ b/SOURCES/1024-device-clean-up-dispatcher-calls-rh1888348.patch @@ -0,0 +1,33 @@ +From bb35124e97fbe524b65bcaac2af649d9d37f3a2a Mon Sep 17 00:00:00 2001 +From: Beniamino Galvani +Date: Mon, 11 Jan 2021 16:40:21 +0100 +Subject: [PATCH] device: clean up dispatcher calls when canceling an + activation + +Ensure the callback for dispatcher calls is not executed, or it will +resume the activation chain we want to interrupt. + +https://bugzilla.redhat.com/show_bug.cgi?id=1888348 +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/723 +(cherry picked from commit 8180b0180beba0c492bf172a32069c77e501f884) +(cherry picked from commit 88eb0beb5277da7973bf0f22bfd547abb4396988) +(cherry picked from commit cdbd6bd9e139d11aacd2447994599763ab3624cd) +--- + src/devices/nm-device.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c +index 012af4d9a5..0fd3fe2adb 100644 +--- a/src/devices/nm-device.c ++++ b/src/devices/nm-device.c +@@ -15527,6 +15527,7 @@ _cancel_activation (NMDevice *self) + priv->fw_state = FIREWALL_STATE_INITIALIZED; + } + ++ dispatcher_cleanup (self); + ip_check_gw_ping_cleanup (self); + + /* Break the activation chain */ +-- +2.26.2 + diff --git a/SPECS/NetworkManager.spec b/SPECS/NetworkManager.spec index 4ceae0c..09b780c 100644 --- a/SPECS/NetworkManager.spec +++ b/SPECS/NetworkManager.spec @@ -7,7 +7,7 @@ %global epoch_version 1 %global rpm_version 1.26.0 %global real_version 1.26.0 -%global release_version 12 +%global release_version 13 %global snapshot %{nil} %global git_sha %{nil} @@ -173,6 +173,7 @@ Patch1020: 1020-fix-unauth-user-can-make-nm-crash-rh1890887.patch Patch1021: 1021-initrd-vlan-fixes-rh1903695-rh1903698.patch Patch1022: 1022-initrd-fix-parsing-with-empty-token-rh1902791.patch Patch1023: 1023-initrd-fix-failing-unit-test-rh1903698.patch +Patch1024: 1024-device-clean-up-dispatcher-calls-rh1888348.patch # The pregenerated docs contain default values and paths that depend # on the configure options when creating the source tarball. @@ -1120,7 +1121,10 @@ fi %changelog -* Wed Dec 4 2020 Antonio Cardace - 1:1.26.0-12 +* Wed Jan 20 2021 Beniamino Galvani - 1:1.26.0-13 +- device: clean up dispatcher calls when canceling an activation (rh #1888348) + +* Fri Dec 4 2020 Antonio Cardace - 1:1.26.0-12 - initrd: fix failing unit test 'test_vlan_over_bond' (rh #1903698) * Wed Dec 2 2020 Antonio Cardace - 1:1.26.0-11 @@ -1128,7 +1132,7 @@ fi - initrd: fix parsing of ip= argument with dotted interface name (rh #1903695) - initrd: fix parsing with empty token (rh #1902791) -* Tue Oct 28 2020 Antonio Cardace - 1:1.26.0-10 +* Wed Oct 28 2020 Antonio Cardace - 1:1.26.0-10 - nm-manager: fix crash that can be caused by an anauthorized user (rh #1890887) * Tue Oct 20 2020 Beniamino Galvani - 1:1.26.0-9