SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge request !1495 from 'fix-cancellation'

Browse Source 
bearer-mbim: fix cancellation when waiting for async SLAAC

https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/merge_requests/1495
This commit is contained in:
Dan Williams
2026-09-20 15:52:15 -05:00
parent b2017e5fd1 07893109ea
commit efb6a9833e
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-bearer-mbim.c
+12 -4
View File
@@ -641,9 +641,10 @@ ip_configuration_async_cleanup (GTask *task)
ctx = g_task_get_task_data (task); ctx = g_task_get_task_data (task);
g_assert (ctx->async_slaac_cancellation_id); if (ctx->async_slaac_cancellation_id) {
g_cancellable_disconnect (g_task_get_cancellable (task), ctx->async_slaac_cancellation_id); g_cancellable_disconnect (g_task_get_cancellable (task), ctx->async_slaac_cancellation_id);
ctx->async_slaac_cancellation_id = 0; ctx->async_slaac_cancellation_id = 0;
}
g_assert (ctx->async_slaac_notification_id); g_assert (ctx->async_slaac_notification_id);
if (g_signal_handler_is_connected (ctx->mbim, ctx->async_slaac_notification_id)) if (g_signal_handler_is_connected (ctx->mbim, ctx->async_slaac_notification_id))
@@ -667,8 +668,15 @@ ip_configuration_async_timeout (GTask *task)
} }
static void static void
ip_configuration_async_cancelled (GTask *task) ip_configuration_async_cancelled (GCancellable *cancellable,
GTask *task)
{ {
ConnectContext *ctx;
/* Avoid the explicit g_cancellable_disconnect(), which would deadlock */
ctx = g_task_get_task_data (task);
ctx->async_slaac_cancellation_id = 0;
ip_configuration_async_cleanup (task); ip_configuration_async_cleanup (task);
g_task_return_new_error (task, MM_CORE_ERROR, MM_CORE_ERROR_CANCELLED, g_task_return_new_error (task, MM_CORE_ERROR, MM_CORE_ERROR_CANCELLED,
"Cancelled waiting for SLAAC notification"); "Cancelled waiting for SLAAC notification");