From nobody Tue Apr 7 21:44:30 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1773242670; cv=none; d=zohomail.com; s=zohoarc; b=bDuhahAxlP5nem1xXeBk3YwO4s7bN0LaTS+zL+9BANJ8LUkQ3JlsbijVrL8o8Mz4z3nPMAEUGCnS5x8px81Ul4Hww0YTV4FWAN3KEFsR92SfBjGK6meQKBeIEmLvDkjI33R6tPS9wDXlVwgy7sPo0A04SZ4elmKjLxv8UNnfZPg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773242670; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=hk+6WitVlVGkLnyfFcKBYLT4xUuwHfgalIqmE+TwtW8=; b=HaSuZWKJNzisjpVhr+bP8pj/SIhNzKqYi8YFZl7ytEcTRX4T11zBkSnbWg3KiKDML1kDyCeCp2laRqJ8V0b/JMIqkyw6RirK2lE1BPwtDKEvuE14MmIbxXTZQCS6aiOiWCfybPCZIWgS35pQqW6YelBJBELxgRHTGzEn5QOQ0Co= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773242670475745.6103887479366; Wed, 11 Mar 2026 08:24:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0LEB-0006zz-JL; Wed, 11 Mar 2026 11:12:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w0LBn-0001RV-7z; Wed, 11 Mar 2026 11:09:35 -0400 Received: from isrv.corpit.ru ([212.248.84.144]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w0LBl-0005lx-7D; Wed, 11 Mar 2026 11:09:34 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 26DFA191EA1; Wed, 11 Mar 2026 18:04:43 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 14E5C37C2E2; Wed, 11 Mar 2026 18:05:21 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tls.msk.ru; s=202602; t=1773241483; bh=OX1yRQrjvcNrTu5Uqdaf9TalndvJT2EDN5zhfa1wsv8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OXKrQH/OmJ4fgCyPhyKg4jK+lW/lzwLpbPKOPX7P5B0tUSj5f32RPdZLJ4DaLI8Z6 kn98JyJaLOJZ+/vSqOR4ipA96ZAAJEwIyRCxKqPTiI23nCHa6m/p6SD06o3WW4RNS/ 9hTfOhxeNRtICUWlUEvvZiGABiVTrcRkIg6I8DWN7/OA10i7LOjYG5p16udQUAv0XX n4UsqMk7iQ9DEAJeLqHzeAO9b/XT15qUMlDF2MAIEcsuVieti6P0SmBLJdstQy2xFr eQJkJ04H5YigyV8UbY77keZUfdnitwsI6IOrcKYbdQaFmT/SoNb4LiPoJoLJ0wLPG1 JppE2wb6Qa6Fg== From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Michael Tokarev Subject: [Stable-10.1.5 30/46] io: fix cleanup for websock I/O source data on cancellation Date: Wed, 11 Mar 2026 18:03:06 +0300 Message-ID: <20260311150327.1084669-30-mjt@tls.msk.ru> X-Mailer: git-send-email 2.47.3 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.248.84.144; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @tls.msk.ru) X-ZM-MESSAGEID: 1773242671435158500 From: Daniel P. Berrang=C3=A9 The websock code will create a GSource for tracking completion of the handshake process, passing a QIOTask which is freed by the callback when it completes, which means when a source is cancelled, nothing is free'ing the task. Switch to provide a data free callback to the GSource, which ensures the QIOTask is always freed even when the main event callback never fires. Fixes: https://gitlab.com/qemu-project/qemu/-/issues/3114 Signed-off-by: Daniel P. Berrang=C3=A9 (cherry picked from commit 9545c059f77e3f814fcbaba83203572ea655c50e) Signed-off-by: Michael Tokarev diff --git a/io/channel-websock.c b/io/channel-websock.c index 13975de4d8..c9d5861230 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -526,11 +526,32 @@ static int qio_channel_websock_handshake_read(QIOChan= nelWebsock *ioc, return 1; } =20 +typedef struct QIOChannelWebsockData { + QIOTask *task; +} QIOChannelWebsockData; + +static void qio_channel_websock_data_free(gpointer user_data) +{ + QIOChannelWebsockData *data =3D user_data; + /* + * Usually 'task' will be NULL since the GSource + * callback will either complete the task or pass + * it on to a new GSource. We'll see a non-NULL + * task here only if the GSource was released before + * its callback triggers + */ + if (data->task) { + qio_task_free(data->task); + } + g_free(data); +} + static gboolean qio_channel_websock_handshake_send(QIOChannel *ioc, GIOCondition condition, gpointer user_data) { - QIOTask *task =3D user_data; + QIOChannelWebsockData *data =3D user_data; + QIOTask *task =3D data->task; QIOChannelWebsock *wioc =3D QIO_CHANNEL_WEBSOCK( qio_task_get_source(task)); Error *err =3D NULL; @@ -545,7 +566,6 @@ static gboolean qio_channel_websock_handshake_send(QIOC= hannel *ioc, trace_qio_channel_websock_handshake_fail(ioc, error_get_pretty(err= )); qio_task_set_error(task, err); qio_task_complete(task); - qio_task_free(task); wioc->hs_io_tag =3D 0; return FALSE; } @@ -562,7 +582,6 @@ static gboolean qio_channel_websock_handshake_send(QIOC= hannel *ioc, trace_qio_channel_websock_handshake_complete(ioc); qio_task_complete(task); } - qio_task_free(task); wioc->hs_io_tag =3D 0; return FALSE; } @@ -574,7 +593,8 @@ static gboolean qio_channel_websock_handshake_io(QIOCha= nnel *ioc, GIOCondition condition, gpointer user_data) { - QIOTask *task =3D user_data; + QIOChannelWebsockData *data =3D user_data, *newdata =3D NULL; + QIOTask *task =3D data->task; QIOChannelWebsock *wioc =3D QIO_CHANNEL_WEBSOCK( qio_task_get_source(task)); Error *err =3D NULL; @@ -590,7 +610,6 @@ static gboolean qio_channel_websock_handshake_io(QIOCha= nnel *ioc, trace_qio_channel_websock_handshake_fail(ioc, error_get_pretty(err= )); qio_task_set_error(task, err); qio_task_complete(task); - qio_task_free(task); wioc->hs_io_tag =3D 0; return FALSE; } @@ -603,12 +622,14 @@ static gboolean qio_channel_websock_handshake_io(QIOC= hannel *ioc, error_propagate(&wioc->io_err, err); =20 trace_qio_channel_websock_handshake_reply(ioc); + newdata =3D g_new0(QIOChannelWebsockData, 1); + newdata->task =3D g_steal_pointer(&data->task); wioc->hs_io_tag =3D qio_channel_add_watch( wioc->master, G_IO_OUT, qio_channel_websock_handshake_send, - task, - NULL); + newdata, + qio_channel_websock_data_free); return FALSE; } =20 @@ -904,12 +925,12 @@ void qio_channel_websock_handshake(QIOChannelWebsock = *ioc, gpointer opaque, GDestroyNotify destroy) { - QIOTask *task; + QIOChannelWebsockData *data =3D g_new0(QIOChannelWebsockData, 1); =20 - task =3D qio_task_new(OBJECT(ioc), - func, - opaque, - destroy); + data->task =3D qio_task_new(OBJECT(ioc), + func, + opaque, + destroy); =20 trace_qio_channel_websock_handshake_start(ioc); trace_qio_channel_websock_handshake_pending(ioc, G_IO_IN); @@ -917,8 +938,8 @@ void qio_channel_websock_handshake(QIOChannelWebsock *i= oc, ioc->master, G_IO_IN, qio_channel_websock_handshake_io, - task, - NULL); + data, + qio_channel_websock_data_free); } =20 =20 --=20 2.47.3