From nobody Wed Nov 5 00:14:59 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1500929072021483.6379060055282; Mon, 24 Jul 2017 13:44:32 -0700 (PDT) Received: from localhost ([::1]:56887 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZkDO-0007ks-J0 for importer@patchew.org; Mon, 24 Jul 2017 16:44:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZhtl-0004JG-9H for qemu-devel@nongnu.org; Mon, 24 Jul 2017 14:16:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZhti-0008IV-4q for qemu-devel@nongnu.org; Mon, 24 Jul 2017 14:16:05 -0400 Received: from mail-pf0-x231.google.com ([2607:f8b0:400e:c00::231]:36455) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dZhth-0008IA-UO for qemu-devel@nongnu.org; Mon, 24 Jul 2017 14:16:02 -0400 Received: by mail-pf0-x231.google.com with SMTP id z129so10196594pfb.3 for ; Mon, 24 Jul 2017 11:16:00 -0700 (PDT) Received: from servo.cypherpath.com (68-113-0-218.static.knwc.wa.charter.com. [68.113.0.218]) by smtp.gmail.com with ESMTPSA id c63sm26206759pfk.79.2017.07.24.11.15.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Jul 2017 11:15:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cypherpath.com; s=google; h=mime-version:from:to:cc:subject:date:message-id; bh=GfJIyaYzJ3bW9RRPLyMi/LfuQepYshM4fafOuh7sTR0=; b=T/sS6uEkNzh6WGf5g6R+/dUdir9Levt6Nk7YMo/GlBdrjCz3NqUplSdp2eL0MVfuIf c08kf/pkVf2qmprBo0XmqYMvSW/WTsu04EmehgI9AjdE4JT/w1RmPK+PxdrGXgow2d+Y t0j1tO8v7HvZ5WKE1jFOwbjuWpNRHyxtJOHTY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:to:cc:subject:date:message-id; bh=GfJIyaYzJ3bW9RRPLyMi/LfuQepYshM4fafOuh7sTR0=; b=XGuuEUD6X2Pk2icFAFSVhSeQyFB2FK28kOMoXNanGn7Ssu5A8+EH5v4ro5ebBA5YfY 4qAhzTSNDgXCoUQPzO2cpclxjdQo6uuB6xdqsVQil+kNMDFF1eiRWGREwCLTqy0IushF 1qUjpwaB/ZkKXC4nP2aylMH1rlOprwVJg1Ym4SDqOqaQPVq3jZheotK4h9teB4zqiXQJ hpi4DT3NpW8m+bYGiY0VPTXBXScxw8rFZHZ5Ue7+VyFMJxu4Y+1Q1CzS5HMF0i/QOa6R jhUjkT3jRTk2czGUSrapKlnz9GG6Ivq5Us5tfz590igXwajSynAb4wTSQ/ISYLjrCtps LKVA== X-Gm-Message-State: AIVw112e1R550kzNfTxK7jkKnoM+S7jtmMovwTn3TVWbOMkB/pvMDL+I 39XE7FLl3tO6k8Mut422KjJ5XARk7CtYXU/3fUYqIOsQO2qVM2/WrflMSzCb2DMHUtOYnnT08ao HsRp1 MIME-Version: 1.0 X-Received: by 10.84.238.199 with SMTP id l7mr18545299pln.267.1500920159234; Mon, 24 Jul 2017 11:15:59 -0700 (PDT) From: Brandon Carpenter To: qemu-devel@nongnu.org Date: Mon, 24 Jul 2017 11:15:44 -0700 Message-Id: <20170724181544.20292-1-brandon.carpenter@cypherpath.com> X-Mailer: git-send-email 2.13.3 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::231 X-Mailman-Approved-At: Mon, 24 Jul 2017 16:38:57 -0400 Subject: [Qemu-devel] [PATCH] io: Always remove an old channel watch before adding a new one. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kraxel@redhat.com, Brandon Carpenter Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Also set saved handle to zero when removing without adding a new watch. Signed-off-by: Brandon Carpenter Reviewed-by tags to the commit message when you re-post. Reviewed-by: Daniel P. Berrange Reviewed-by: Paolo Bonzini --- ui/vnc-auth-vencrypt.c | 3 +++ ui/vnc-ws.c | 6 ++++++ ui/vnc.c | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/ui/vnc-auth-vencrypt.c b/ui/vnc-auth-vencrypt.c index ffaab57550..c3eece4fa7 100644 --- a/ui/vnc-auth-vencrypt.c +++ b/ui/vnc-auth-vencrypt.c @@ -77,6 +77,9 @@ static void vnc_tls_handshake_done(QIOTask *task, vnc_client_error(vs); error_free(err); } else { + if (vs->ioc_tag) { + g_source_remove(vs->ioc_tag); + } vs->ioc_tag =3D qio_channel_add_watch( vs->ioc, G_IO_IN | G_IO_OUT, vnc_client_io, vs, NULL); start_auth_vencrypt_subauth(vs); diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c index f530cd5474..eaf309553c 100644 --- a/ui/vnc-ws.c +++ b/ui/vnc-ws.c @@ -36,6 +36,9 @@ static void vncws_tls_handshake_done(QIOTask *task, error_free(err); } else { VNC_DEBUG("TLS handshake complete, starting websocket handshake\n"= ); + if (vs->ioc_tag) { + g_source_remove(vs->ioc_tag); + } vs->ioc_tag =3D qio_channel_add_watch( QIO_CHANNEL(vs->ioc), G_IO_IN, vncws_handshake_io, vs, NULL); } @@ -97,6 +100,9 @@ static void vncws_handshake_done(QIOTask *task, } else { VNC_DEBUG("Websock handshake complete, starting VNC protocol\n"); vnc_start_protocol(vs); + if (vs->ioc_tag) { + g_source_remove(vs->ioc_tag); + } vs->ioc_tag =3D qio_channel_add_watch( vs->ioc, G_IO_IN, vnc_client_io, vs, NULL); } diff --git a/ui/vnc.c b/ui/vnc.c index eb91559b6b..ec86d6ad97 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -1121,6 +1121,7 @@ static void vnc_disconnect_start(VncState *vs) vnc_set_share_mode(vs, VNC_SHARE_MODE_DISCONNECTED); if (vs->ioc_tag) { g_source_remove(vs->ioc_tag); + vs->ioc_tag =3D 0; } qio_channel_close(vs->ioc, NULL); vs->disconnecting =3D TRUE; @@ -2931,6 +2932,9 @@ static void vnc_connect(VncDisplay *vd, QIOChannelSoc= ket *sioc, VNC_DEBUG("New client on socket %p\n", vs->sioc); update_displaychangelistener(&vd->dcl, VNC_REFRESH_INTERVAL_BASE); qio_channel_set_blocking(vs->ioc, false, NULL); + if (vs->ioc_tag) { + g_source_remove(vs->ioc_tag); + } if (websocket) { vs->websocket =3D 1; if (vd->tlscreds) { --=20 2.13.3 --=20 CONFIDENTIALITY NOTICE: This e-mail message, including any attachments, is=20 for the sole use of the intended recipient(s) and may contain proprietary,=20 confidential or privileged information or otherwise be protected by law.=20 Any unauthorized review, use, disclosure or distribution is prohibited. If=20 you are not the intended recipient, please notify the sender and destroy=20 all copies and the original message.