{"id":2222797,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2222797/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260413164338.42894-3-mohamed@unpredictable.fr/","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":"<20260413164338.42894-3-mohamed@unpredictable.fr>","date":"2026-04-13T16:43:37","name":"[2/3] tap-win32: cleanup leaked handles on tap close","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"540ab0429a182f1aec91ba91341d52f91aaed2f0","submitter":{"id":91318,"url":"http://patchwork.ozlabs.org/api/1.1/people/91318/?format=json","name":"Mohamed Mediouni","email":"mohamed@unpredictable.fr"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260413164338.42894-3-mohamed@unpredictable.fr/mbox/","series":[{"id":499732,"url":"http://patchwork.ozlabs.org/api/1.1/series/499732/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=499732","date":"2026-04-13T16:43:36","name":"win32: Windows-specific fixes from the mailing list","version":1,"mbox":"http://patchwork.ozlabs.org/series/499732/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2222797/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2222797/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 (2048-bit key;\n unprotected) header.d=unpredictable.fr header.i=@unpredictable.fr\n header.a=rsa-sha256 header.s=sig1 header.b=duFfb/2r;\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=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.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 4fvYTf2Qjqz1xtJ\n\tfor ; Tue, 14 Apr 2026 02:56:38 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wCKZy-0004K5-Pd; Mon, 13 Apr 2026 12:56:06 -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 1wCKZx-0004Jn-7z\n for qemu-devel@nongnu.org; Mon, 13 Apr 2026 12:56:05 -0400","from qs-2004g-snip4-11.eps.apple.com ([57.103.84.73]\n helo=outbound.qs.icloud.com)\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 1wCKZv-0006NU-F4\n for qemu-devel@nongnu.org; Mon, 13 Apr 2026 12:56:05 -0400","from outbound.qs.icloud.com (unknown [127.0.0.2])\n by p00-icloudmta-asmtp-us-east-2d-100-percent-5 (Postfix) with ESMTPS id\n A16941800547; Mon, 13 Apr 2026 16:55:59 +0000 (UTC)","from localhost.localdomain (unknown [17.57.155.37])\n by p00-icloudmta-asmtp-us-east-2d-100-percent-5 (Postfix) with ESMTPSA id\n 2C2EE18003D4; Mon, 13 Apr 2026 16:43:44 +0000 (UTC)"],"Dkim-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr;\n s=sig1; t=1776099362; x=1778691362;\n bh=9f07FQNjyD0hoJ0U5EAu159dHGKdBEB3GRYAO9xnLMs=;\n h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme;\n b=duFfb/2rmCto425LJTPfTltwSWFddTZTI68/Otkk7QZOH+iAqtVtArQ7ASYE4CgmHvK2WJZZUbTfE4S8pwg1ThhbcpEhp/mpb3lYW+de8U8b6lvdNbH4I6bQP/CbRgwUktQp3eRLcYcclzhwqfscc4vvFFxVdK0sA5yog0Sq2Sp9XdbVaap0a4hsXRpS49DM+2qWQSCH/y9yAPpUFgS49wSdm1hjyfI1usWcYb8wBt6KPCFgKEnfVX8LMkLql839+xgjv1TZ2d+45QID6EePBkCcUXMyF7i+L37xXoWzoSkUSNAPcKD8ppb+lm8SzU5HH6Gh/aFTlflQBCNTuIbV7Q==","mail-alias-created-date":"1752046281608","From":"Mohamed Mediouni ","To":"qemu-devel@nongnu.org","Cc":"Stefan Weil , Paolo Bonzini ,\n\t=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ,\n Jason Wang , Gal Horowitz ","Subject":"[PATCH 2/3] tap-win32: cleanup leaked handles on tap close","Date":"Mon, 13 Apr 2026 18:43:37 +0200","Message-ID":"<20260413164338.42894-3-mohamed@unpredictable.fr>","X-Mailer":"git-send-email 2.50.1","In-Reply-To":"<20260413164338.42894-1-mohamed@unpredictable.fr>","References":"<20260413164338.42894-1-mohamed@unpredictable.fr>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Authority-Info-Out":"v=2.4 cv=Q6zfIo2a c=1 sm=1 tr=0 ts=69dd2020\n cx=c_apl:c_pps:t_out a=bsP7O+dXZ5uKcj+dsLqiMw==:117\n a=bsP7O+dXZ5uKcj+dsLqiMw==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22\n a=pGLkceISAAAA:8 a=vyeFzZFV0_OpdQW4t0UA:9","X-Proofpoint-ORIG-GUID":"LkWj2pst9LbFVv6vSycUSyjcoe1-0Min","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwNDEzMDE2NiBTYWx0ZWRfX2AztmPWOGd+G\n PL8KGu6p5ICjsdjWyBCe8cN1rnYjoSZ2tWwAOLaYOEP1DTJNg1qtOpJyUz6ZVjsBc8CnMX2yYlL\n oQbZ0IlnTkcJ4umIdZxWdlKgogD/4a4CoRBG7/rgvW/3LNEkdsIkLY3nb49ehbA0Sq2b8tWc8m/\n L9a5W1Od4KPfQL6yOvigQ1ZcV+CpUzoHMSfqfBT+HLu8DvUXcDSSirECbXY89FiIwwrrYjQxDiG\n PEUAau9hrV6nlolxjywKeqEhgXxAB6BZwVnUgLAtEhJxLgS+aajChl5vr3dcoY3/1kIMDlppLYq\n CHm2yV+iHf3Zsv+7VsXXkaGkdK85qxoqhyB9jIzsDDbFH+9bkqNqx+zY+sk1og=","X-Proofpoint-GUID":"LkWj2pst9LbFVv6vSycUSyjcoe1-0Min","X-Proofpoint-Virus-Version":"vendor=baseguard\n engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49\n definitions=2026-04-13_03,2026-04-13_04,2025-10-01_01","X-Proofpoint-Spam-Details":"rule=notspam policy=default score=0 clxscore=1030\n mlxlogscore=999 adultscore=0 phishscore=0 bulkscore=0 mlxscore=0\n suspectscore=0 spamscore=0 lowpriorityscore=0 malwarescore=0 classifier=spam\n authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000\n definitions=main-2604130166","Received-SPF":"pass client-ip=57.103.84.73;\n envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.icloud.com","X-Spam_score_int":"-27","X-Spam_score":"-2.8","X-Spam_bar":"--","X-Spam_report":"(-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,\n RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001,\n 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":"From: Gal Horowitz \n\nCurrently, all handles owned by a win32 tap are leaked on cleanup.\nThis commit ensures that the handles are properly closed upon tap\ncleanup. A check for the return value of CreateThread is also added.\n\nSigned-off-by: Gal Horowitz \n---\n net/tap-win32.c | 40 +++++++++++++++++++++++++++++++++-------\n 1 file changed, 33 insertions(+), 7 deletions(-)","diff":"diff --git a/net/tap-win32.c b/net/tap-win32.c\nindex 38baf90e0b..ae25e5a883 100644\n--- a/net/tap-win32.c\n+++ b/net/tap-win32.c\n@@ -104,6 +104,7 @@ typedef struct tap_win32_overlapped {\n HANDLE output_queue_semaphore;\n HANDLE free_list_semaphore;\n HANDLE tap_semaphore;\n+ HANDLE thread_handle;\n CRITICAL_SECTION output_queue_cs;\n CRITICAL_SECTION free_list_cs;\n OVERLAPPED read_overlapped;\n@@ -589,6 +590,26 @@ static void tap_win32_free_buffer(tap_win32_overlapped_t *overlapped,\n put_buffer_on_free_list(overlapped, buffer);\n }\n \n+static void tap_win32_close(tap_win32_overlapped_t *overlapped)\n+{\n+ TerminateThread(overlapped->thread_handle, 0);\n+ CloseHandle(overlapped->thread_handle);\n+\n+ CloseHandle(overlapped->tap_semaphore);\n+ CloseHandle(overlapped->free_list_semaphore);\n+ CloseHandle(overlapped->output_queue_semaphore);\n+\n+ DeleteCriticalSection(&overlapped->free_list_cs);\n+ DeleteCriticalSection(&overlapped->output_queue_cs);\n+\n+ CloseHandle(overlapped->write_event);\n+ CloseHandle(overlapped->read_event);\n+\n+ CloseHandle(overlapped->handle);\n+\n+ g_free(overlapped);\n+}\n+\n static int tap_win32_open(tap_win32_overlapped_t **phandle,\n const char *preferred_name)\n {\n@@ -604,7 +625,6 @@ static int tap_win32_open(tap_win32_overlapped_t **phandle,\n unsigned long debug;\n } version;\n DWORD version_len;\n- DWORD idThread;\n \n if (preferred_name != NULL) {\n snprintf(name_buffer, sizeof(name_buffer), \"%s\", preferred_name);\n@@ -642,15 +662,22 @@ static int tap_win32_open(tap_win32_overlapped_t **phandle,\n }\n \n if (!tap_win32_set_status(handle, TRUE)) {\n+ CloseHandle(handle);\n return -1;\n }\n \n tap_win32_overlapped_init(&tap_overlapped, handle);\n \n- *phandle = &tap_overlapped;\n+ tap_overlapped.thread_handle = CreateThread(NULL, 0,\n+ tap_win32_thread_entry, (LPVOID)&tap_overlapped, 0, NULL);\n+\n+ if (tap_overlapped->thread_handle == NULL) {\n+ tap_win32_close(tap_overlapped);\n+ return -1;\n+ }\n+\n+ *phandle = tap_overlapped;\n \n- CreateThread(NULL, 0, tap_win32_thread_entry,\n- (LPVOID)&tap_overlapped, 0, &idThread);\n return 0;\n }\n \n@@ -667,9 +694,8 @@ static void tap_cleanup(NetClientState *nc)\n \n qemu_del_wait_object(s->handle->tap_semaphore, NULL, NULL);\n \n- /* FIXME: need to kill thread and close file handle:\n- tap_win32_close(s);\n- */\n+ tap_win32_close(s->handle);\n+ s->handle = NULL;\n }\n \n static ssize_t tap_receive(NetClientState *nc, const uint8_t *buf, size_t size)\n","prefixes":["2/3"]}