{"id":2222133,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2222133/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260410-qemu-vnc-v2-44-231416f76dc3@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.1/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260410-qemu-vnc-v2-44-231416f76dc3@redhat.com>","date":"2026-04-10T19:19:06","name":"[v2,44/67] ui/vnc: fix vnc_display_init() leak on failure","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"59b99f404a01008487ab0ee3b643c6cd981d20f1","submitter":{"id":66774,"url":"http://patchwork.ozlabs.org/api/1.1/people/66774/?format=json","name":"Marc-André Lureau","email":"marcandre.lureau@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260410-qemu-vnc-v2-44-231416f76dc3@redhat.com/mbox/","series":[{"id":499494,"url":"http://patchwork.ozlabs.org/api/1.1/series/499494/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=499494","date":"2026-04-10T19:18:23","name":"ui: add standalone VNC server over D-Bus","version":2,"mbox":"http://patchwork.ozlabs.org/series/499494/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2222133/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2222133/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=jHuL2ZVl;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fsn0L23JPz1yGb\n\tfor ; Sat, 11 Apr 2026 05:28:34 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wBHRt-0005oz-CL; Fri, 10 Apr 2026 15:23:25 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wBHRr-0005oO-S9\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 15:23:23 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.129.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wBHRq-00023s-Cv\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 15:23:23 -0400","from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-629-EHsQiA3PM2i4BSxHpFdgtg-1; Fri,\n 10 Apr 2026 15:23:20 -0400","from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 99EBF180044D\n for ; Fri, 10 Apr 2026 19:23:19 +0000 (UTC)","from localhost (unknown [10.44.22.4])\n by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id 860E63000C16; Fri, 10 Apr 2026 19:23:17 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1775849001;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=r5ipliGEfImsYLWRZ8XtsDDq+jSdUO3d2Undg+vDmX0=;\n b=jHuL2ZVl83ihIJg0CNSKtYEf2Ky4OMYQZ53y7fhOB5YUlYGgPmhjesITiAfGZ3kt6vPY8o\n UeCq3WFfL+GrRmqdSqMVRaSBuyQ6hNu3NWr9JCxarQGUSFi8qGgu7JVL/C2kqyU6bW7LjD\n AWnD0DkYiYBo8oZXxVaBbMjftNjqoX4=","X-MC-Unique":"EHsQiA3PM2i4BSxHpFdgtg-1","X-Mimecast-MFC-AGG-ID":"EHsQiA3PM2i4BSxHpFdgtg_1775848999","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","Date":"Fri, 10 Apr 2026 23:19:06 +0400","Subject":"[PATCH v2 44/67] ui/vnc: fix vnc_display_init() leak on failure","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"8bit","Message-Id":"<20260410-qemu-vnc-v2-44-231416f76dc3@redhat.com>","References":"<20260410-qemu-vnc-v2-0-231416f76dc3@redhat.com>","In-Reply-To":"<20260410-qemu-vnc-v2-0-231416f76dc3@redhat.com>","To":"qemu-devel@nongnu.org","Cc":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","X-Developer-Signature":"v=1; a=openpgp-sha256; l=2626;\n i=marcandre.lureau@redhat.com; h=from:subject:message-id;\n bh=xGMPjiKUOaS83BNgVUACNJ3GgkwfP0afhLEHwJZ2v0Y=;\n b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBp2U0WEsTxXciBVknFi5uX03YbTlWDL5b/ExK7E\n i0skVNu71OJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCadlNFgAKCRDa6OEJdZac\n 5eD6EACYernzMfW9MGdD3eHc8MlFZQIwkwxO8EAv366QUGSiZWxNXOFNrYTqjG1DP4sPX4dF1vs\n UU1NTCkoGERCY0lVEL7eIgHTBz7jbBHKEMZc7sJusRkSthCDTDKQbSYwRYOMm86EbnTsgXaWBZ2\n obIpP0MnteIrMTVCFi30Y6zhJIUnUl9DgpcCvG5lWWD8kd7kBEgYgHD7dYahd/j18eQPkhnc8FB\n kkFAoKgdyE+cHGCjbPt0BRCNBjOa7j3A1yf3Tam4OwdmE8hJqIF6RnoJNKN3RC7q+RdNdHuw9XB\n PO2Vd81ixfUh8/ETCptJvwjHr3oY4Moo3llzRWlE2gcqkbh7w1/bJ0CJwtJTlpFHkG1gtxkbqKO\n QIDCvopBxgCPo7A+8e/gnUVC6nNS1PZ5ilAKXKBRcpiVpSowUk0XGjUYoL/k/JkNRCzPpvm5Jy+\n Li53n9TA0OT8HKYMC8dIgMq1wxrdOZwHy0d0WtXndkVROg6gU7+slx75+5iqLsz2z1evrnTNscb\n bHQgmMk+C5KCfluZr0pfL1SWSldxPp0h80VrTXwU+DaCf1w4Dt6XU7IO06kvXZQ3J5cb6378ZXM\n s61XkWHX1p5dGUhuMZpbIxxUTYXkelXlZJGElyedHfp34MhwyyZbBOVUK3yD3JoQMJjtuc4pmwE\n lIpqfOH9oF3jabw==","X-Developer-Key":"i=marcandre.lureau@redhat.com; a=openpgp;\n fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.4","Received-SPF":"pass client-ip=170.10.129.124;\n envelope-from=marcandre.lureau@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com","X-Spam_score_int":"-25","X-Spam_score":"-2.6","X-Spam_bar":"--","X-Spam_report":"(-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.54,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,\n SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham 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":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Do not add the display state to the vnc list, if the initialization\nfailed. Add vnc_display_free(), to free the display state and associated\ndata in such case. The function is meant to be public and reused in the\nfollowing changes.\n\nSigned-off-by: Marc-André Lureau \n---\n ui/vnc.c | 33 +++++++++++++++++++++++++++++----\n 1 file changed, 29 insertions(+), 4 deletions(-)","diff":"diff --git a/ui/vnc.c b/ui/vnc.c\nindex 522d4d8fb88..512e11d687e 100644\n--- a/ui/vnc.c\n+++ b/ui/vnc.c\n@@ -3422,6 +3422,8 @@ static void vmstate_change_handler(void *opaque, bool running, RunState state)\n update_displaychangelistener(&vd->dcl, VNC_REFRESH_INTERVAL_BASE);\n }\n \n+static void vnc_display_free(VncDisplay *vd);\n+\n void vnc_display_init(const char *id, Error **errp)\n {\n VncDisplay *vd;\n@@ -3431,8 +3433,9 @@ void vnc_display_init(const char *id, Error **errp)\n }\n vd = g_malloc0(sizeof(*vd));\n \n+ qemu_mutex_init(&vd->mutex);\n vd->id = g_strdup(id);\n- QTAILQ_INSERT_TAIL(&vnc_displays, vd, next);\n+ vd->dcl.ops = &dcl_ops;\n \n QTAILQ_INIT(&vd->clients);\n vd->expires = TIME_MAX;\n@@ -3446,22 +3449,22 @@ void vnc_display_init(const char *id, Error **errp)\n }\n \n if (!vd->kbd_layout) {\n+ vnc_display_free(vd);\n return;\n }\n \n vd->share_policy = VNC_SHARE_POLICY_ALLOW_EXCLUSIVE;\n vd->connections_limit = 32;\n \n- qemu_mutex_init(&vd->mutex);\n vnc_start_worker_thread();\n \n- vd->dcl.ops = &dcl_ops;\n register_displaychangelistener(&vd->dcl);\n vd->kbd = qkbd_state_init(vd->dcl.con);\n vd->vmstate_handler_entry = qemu_add_vm_change_state_handler(\n &vmstate_change_handler, vd);\n-}\n \n+ QTAILQ_INSERT_TAIL(&vnc_displays, vd, next);\n+}\n \n static void vnc_display_close(VncDisplay *vd)\n {\n@@ -3505,6 +3508,28 @@ static void vnc_display_close(VncDisplay *vd)\n #endif\n }\n \n+static void vnc_display_free(VncDisplay *vd)\n+{\n+ if (!vd) {\n+ return;\n+ }\n+\n+ assert(QTAILQ_EMPTY(&vd->clients));\n+\n+ vnc_display_close(vd);\n+ unregister_displaychangelistener(&vd->dcl);\n+ qkbd_state_free(vd->kbd);\n+ qemu_del_vm_change_state_handler(vd->vmstate_handler_entry);\n+ kbd_layout_free(vd->kbd_layout);\n+ qemu_mutex_destroy(&vd->mutex);\n+ if (QTAILQ_IN_USE(vd, next)) {\n+ QTAILQ_REMOVE(&vnc_displays, vd, next);\n+ }\n+ g_free(vd->id);\n+ g_free(vd);\n+}\n+\n+\n int vnc_display_password(const char *id, const char *password, Error **errp)\n {\n VncDisplay *vd = vnc_display_find(id);\n","prefixes":["v2","44/67"]}