From 38f7f18b701bfcc100f60fad365d96b75dbfb931 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 09 2021 10:04:15 +0000 Subject: import ModemManager-1.10.8-4.el8 --- diff --git a/SOURCES/0003-modem-simple-don-t-assert-ongoing-connect.patch b/SOURCES/0003-modem-simple-don-t-assert-ongoing-connect.patch new file mode 100644 index 0000000..6e20aa3 --- /dev/null +++ b/SOURCES/0003-modem-simple-don-t-assert-ongoing-connect.patch @@ -0,0 +1,37 @@ +From e95140e9137c920638649b6d3fe4878176cd92fd Mon Sep 17 00:00:00 2001 +From: Aleksander Morgado +Date: Wed, 13 Nov 2019 18:20:27 +0100 +Subject: [PATCH] iface-modem-simple: don't assert ongoing connect cancellable + + [11642]: [1573665255.321490] Couldn't reload current power state: QMI operation failed: Transaction timed out + [11642]: [1573665255.321697] No need to change power state: already in 'on' power state + [11642]: [1573665255.330864] Modem (Quectel) '/sys/devices/platform/ehci-platform/usb1/1-1' completely disposed + ** + ERROR:mm-iface-modem-simple.c:44:private_free: assertion failed: (!priv->ongoing_connect) + +If the modem goes away in the middle of a connection attempt, there's +no explicit connection cancellation performed, we just cleanup the +modem object. In this case, the ongoing attempt cancellable will still +exist, so just clean it up as well. + +(cherry picked from commit 5e8c64d092e85f6d5479675499463464e1a42de6) +--- + src/mm-iface-modem-simple.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/mm-iface-modem-simple.c b/src/mm-iface-modem-simple.c +index 893c470c..1e29c3ce 100644 +--- a/src/mm-iface-modem-simple.c ++++ b/src/mm-iface-modem-simple.c +@@ -41,7 +41,7 @@ typedef struct { + static void + private_free (Private *priv) + { +- g_assert (!priv->ongoing_connect); ++ g_clear_object (&priv->ongoing_connect); + g_slice_free (Private, priv); + } + +-- +2.29.2 + diff --git a/SPECS/ModemManager.spec b/SPECS/ModemManager.spec index 8c50d27..33e1495 100644 --- a/SPECS/ModemManager.spec +++ b/SPECS/ModemManager.spec @@ -7,10 +7,11 @@ Summary: Mobile broadband modem management service Name: ModemManager Version: 1.10.8 -Release: 2%{?dist} +Release: 4%{?dist} Source: https://www.freedesktop.org/software/ModemManager/%{name}-%{version}.tar.xz Patch0: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/commit/fd1a26fc36df.patch#/0001-plugin-ignore-unwanted-net-ports.patch Patch1: 0002-port-serial-un-schedule-flash-operation-as-soon-as-i.patch +Patch2: 0003-modem-simple-don-t-assert-ongoing-connect.patch License: GPLv2+ Group: System Environment/Base @@ -94,6 +95,7 @@ Vala bindings for ModemManager %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build # Regenerate configure, because the one that is shipped @@ -193,6 +195,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/vala/vapi/libmm-glib.* %changelog +* Tue Apr 20 2021 Beniamino Galvani - 1.10.8-4 +- Fix crash when modem goes away during a connection attempt (rh #1936416) + +* Wed Feb 24 2021 Beniamino Galvani - 1.10.8-3 +- Rebuild to fix multilib conflicts (rh #1853161) + * Fri Feb 14 2020 Antonio Cardace - 1.10.8-2 - Fix race condition when cancelling a flash operation (rh #1758128)