From ca4334de94c5cb2419e36430972acc3176028e47 Mon Sep 17 00:00:00 2001 From: Rukun Mao Date: Wed, 25 Jun 2025 18:38:17 +0000 Subject: [PATCH] broadband-modem: exit with error if enable() is called in enabling state We should not assert. We can error out the latest enabling attempt and let the previous enabling gracefully reach an end. Issue log: "2025-06-22T21:56:52.972448Z NOTICE ModemManager[1842]: [modem2] state changed (disabled -> enabling) ... 2025-06-22T21:57:53.146572Z ERR ModemManager[1842]: [modem2] port cdc-wdm0 timed out 10 consecutive times, marking modem as invalid ... 2025-06-22T21:57:53.185751Z INFO shill[870]: INFO shill: [modem_info.cc(120)] RemoveModem: /org/freedesktop/ModemManager1/Modem/2 2025-06-22T21:57:53.187595Z INFO ModemManager[1842]: [modem2] processing user request to enable modem... " which led to a crash: " 0x00007c474ceb979f (libc.so.6 -pthread_kill.c:44) ??__pthread_kill_implementation 0x00007c474ce6d92c (libc.so.6 -raise.c:26) ??raise 0x00007c474ce584aa (libc.so.6 -abort.c:79) ??abort 0x00007c474d72b269 (libglib-2.0.so.0 -gtestutils.c:3450) ??g_assertion_message 0x00007c474d72b2e3 (libglib-2.0.so.0 -gtestutils.c:3476) ??g_assertion_message_expr 0x00005979074b4b6a (ModemManager -mm-broadband-modem.c) enable 0x00005979074e3b9c (ModemManager -mm-iface-modem.c:2340) handle_enable_auth_ready 0x00007c474d591997 (libgio-2.0.so.0 -gtask.c:1309) g_task_return_now 0x00007c474d590555 (libgio-2.0.so.0 -gtask.c:1378) g_task_return 0x00005979074a57bd (ModemManager -mm-base-modem.c:2011) lock_after_authorize_ready 0x00007c474d591997 (libgio-2.0.so.0 -gtask.c:1309) g_task_return_now 0x00007c474d590555 (libgio-2.0.so.0 -gtask.c:1378) g_task_return 0x00005979074a3fa8 (ModemManager -mm-base-modem.c:1841) base_modem_operation_run ... " Signed-off-by: Rukun Mao --- src/mm-broadband-modem.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index 12982748..9a83ec05 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -12947,7 +12947,11 @@ enable (MMBaseModem *self, return; case MM_MODEM_STATE_ENABLING: - g_assert_not_reached (); + /* Enabling can be ongoing when another user enable request arrives, + * just error out gracefully. */ + g_task_return_new_error (task, MM_CORE_ERROR, MM_CORE_ERROR_WRONG_STATE, + "Cannot enable modem (again): enabling ongoing"); + g_object_unref (task); return; case MM_MODEM_STATE_ENABLED: