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

bearer-mbim: avoid deadlock when cancelling async SLAAC logic

Browse Source 
g_cancellable_disconnect() must not be called from within the
cancellable callback, or it will deadlock.

Signed-off-by: Aleksander Morgado <aleksandermj@google.com>
This commit is contained in:
Aleksander Morgado
2026-09-20 15:49:48 -05:00
committed by Dan Williams
parent 0082587915
commit 07893109ea
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-bearer-mbim.c
+10 -3
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))
@@ -670,6 +671,12 @@ static void
ip_configuration_async_cancelled (GCancellable *cancellable, ip_configuration_async_cancelled (GCancellable *cancellable,
GTask *task) 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");