From nobody Fri Nov 14 16:36:20 2025 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; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1760702631; cv=none; d=zohomail.com; s=zohoarc; b=jMEenrbgvosfk6Kg70/MD2lDJ23U8/DWmHVMsUwUkgrH55Oqin5SiUTtnmRgKi8ICtmXs/FPS6UUNEJ242hHCawCjV4lYFh5vcd4hYbPij/aCI9s4W3RF27oTcxKGEOfATztL28YOfptGrn2arU8C9WSt+DNsMG+24sosXLK9P0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760702631; 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=4afp/6dI6zHZWkA9HSSK0D8+/OSOH9fXxwsEQGCRDlg=; b=g3H675rDb2eTmQ3F0tZ0L1hP5hqBI9X7rqw4oZp/jTR7sBvu2z07dLybrdJ4RQwfiLGjmMwLBdG1/2PjtoH72j//ZpWE8fElo9sggJY7gNMRgc/i8xPbEoCBbgDIPcSHx+Ks5np8R3iZ5mKUyyjXeheKb4PA2iqFDp/Zd/6G/5s= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760702631460150.64528041633343; Fri, 17 Oct 2025 05:03:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9jAK-0008Ho-Si; Fri, 17 Oct 2025 08:02:37 -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 1v9j9R-0007bv-RI for qemu-devel@nongnu.org; Fri, 17 Oct 2025 08:01:42 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v9j7T-0001BH-18 for qemu-devel@nongnu.org; Fri, 17 Oct 2025 08:01:39 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-47114a40161so18085835e9.3 for ; Fri, 17 Oct 2025 04:59:37 -0700 (PDT) Received: from GAL-PC.localdomain (bzq-79-177-159-123.red.bezeqint.net. [79.177.159.123]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42707b482b3sm3208493f8f.50.2025.10.17.04.59.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Oct 2025 04:59:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760702373; x=1761307173; darn=nongnu.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=4afp/6dI6zHZWkA9HSSK0D8+/OSOH9fXxwsEQGCRDlg=; b=d7DzhikN5JocZTRUlsoFtp8CZwfQweWQAYbGB9Bxh3faBbH5yXgck3x1JqRvQDDL5n vPrFSoxYoC99F+0tCCl7HJiMMJrpoEmlz3GqxkhIWu0YwEu3pkdEnRSdlT9n1YZ4elHm Dg6PWzM0hfwTsur0n+gB6rViC6hyZ9vFQ6n72v8/l+8IfaWplqfnhr+FYy6bAP9brZwK A+f8dUCMXFTZBksociQSfHA18HRd2n2VMesELOkK4W0HWjV15jPnx8H35ucFgKQVz0Fu 4qBHQL+Qabh+cGh3d9g7+PGWVimpUko4+WhL9o/d1pAMzmUSDmALidurUoDnY9z/7oR3 ck4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760702373; x=1761307173; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4afp/6dI6zHZWkA9HSSK0D8+/OSOH9fXxwsEQGCRDlg=; b=dhXiIEb7ZWHFxOF6IUvGW1wI4MgYmvLrim0c34OUAjAgrLvpW3kWGUda+ydlMLcADh GGktPV8IpO3Fvs1BScxAP2ioVJfqAvc3kByvzV8CBwquEJ1oUJSxMHxEu99uwWX3F3dO jtSjswM0D+0OKDDSM0dTTd26GjUEdP8GIXixFe3SegXBA44dV7clrH184gowE2v6pdbI L7GFhbImbzuCPzDhBXK7+9Hl8GitDX+kgllbZ+SuH/y1Zah+gFAz7GwhEmVUXfd95NX4 5o5N3lb1dLyLRCjTv884HT/PQrviqunxVMRZanDcxCwtuNfFDWRQRwHqvNjH00F53+xn 3Mqg== X-Gm-Message-State: AOJu0YyKcEhIwEyImLDVtkCl2cSkU0qjYCrjLfS8mWmdttXOLpO1lI7C D3EwiBSZMV8PMp8VPnMMWkykn7qEMIbZO/hWdQPDHYx6qedrFtcrS7uzgsbTNA== X-Gm-Gg: ASbGncvXHQeQR9JunpxRKq2+MBkQaXseBdvb5xb1yyD6DN1TTdRjkiaiGnLTZ4YTMTR 4VEHWUv/grnIV7psdPGpuQbjraBEgpNPXRwejfBIfyHIhxX7/lsYVoWJFIDNFduTLvc6Bid2/u7 Z/fHv2Y0HAdCzYUpvZ+eDxORywmJ+2AUmeFVT8i4HQqWbmU64wKZMggiQ2BCgIDnZJ1dJLgzKjt cIORV7h13yguko+vXTRfwiJE+t1BVdhUAYHbb/RWellEs92dgY3O1lL5CewQqmTxr1ddeqYuvnL uiVCmjenP12YZJ7fF8IaJVYUxmjPsLHAe/HGzpls/u4vdLL57tL40ayyI2ZspMtH5dR5UBeoIAX fa2SDFEVsJVCf3Ei5jkHulUPC8QgvHwYUTI+pm1N9iC42b7al272wBkX8xHYXlgum6jd8Kr+t+y PQeIgmCc5nHtVd1J/VYtW6AD51EO1Ql+f2lDZO3zzKAJhWHjlux86Hob5SL3AJKRsKmb6Dj0c6/ lQt X-Google-Smtp-Source: AGHT+IHB8QdrAb9W28MQQ3JLbb/Jk4cciv9uYOYgM2SqEMX7yLau0hAMO2UFRpbHXz8XbXvJFFht7g== X-Received: by 2002:a05:600c:64cf:b0:471:12ed:f698 with SMTP id 5b1f17b1804b1-4711786c793mr26462725e9.8.1760702372927; Fri, 17 Oct 2025 04:59:32 -0700 (PDT) From: Gal Horowitz Date: Fri, 17 Oct 2025 14:59:02 +0300 Subject: [PATCH v4 1/2] tap-win32: cleanup leaked handles on tap close MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251017-fix-win32-multiple-taps-v4-1-483415799ed8@gmail.com> References: <20251017-fix-win32-multiple-taps-v4-0-483415799ed8@gmail.com> In-Reply-To: <20251017-fix-win32-multiple-taps-v4-0-483415799ed8@gmail.com> To: qemu-devel@nongnu.org Cc: Jason Wang , Stefan Weil , Gal Horowitz X-Mailer: b4 0.14.2 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=2a00:1450:4864:20::32f; envelope-from=galush.horowitz@gmail.com; helo=mail-wm1-x32f.google.com X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 @gmail.com) X-ZM-MESSAGEID: 1760702633418158500 Currently, all handles owned by a win32 tap are leaked on cleanup. This commit ensures that the handles are properly closed upon tap cleanup. A check for the return value of CreateThread is also added. Signed-off-by: Gal Horowitz --- net/tap-win32.c | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/net/tap-win32.c b/net/tap-win32.c index 38baf90e0b3f121f74eb32f1bff779c84ce03114..ae25e5a883343bf9f570d0f382b= 8c64712d95242 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -104,6 +104,7 @@ typedef struct tap_win32_overlapped { HANDLE output_queue_semaphore; HANDLE free_list_semaphore; HANDLE tap_semaphore; + HANDLE thread_handle; CRITICAL_SECTION output_queue_cs; CRITICAL_SECTION free_list_cs; OVERLAPPED read_overlapped; @@ -589,6 +590,26 @@ static void tap_win32_free_buffer(tap_win32_overlapped= _t *overlapped, put_buffer_on_free_list(overlapped, buffer); } =20 +static void tap_win32_close(tap_win32_overlapped_t *overlapped) +{ + TerminateThread(overlapped->thread_handle, 0); + CloseHandle(overlapped->thread_handle); + + CloseHandle(overlapped->tap_semaphore); + CloseHandle(overlapped->free_list_semaphore); + CloseHandle(overlapped->output_queue_semaphore); + + DeleteCriticalSection(&overlapped->free_list_cs); + DeleteCriticalSection(&overlapped->output_queue_cs); + + CloseHandle(overlapped->write_event); + CloseHandle(overlapped->read_event); + + CloseHandle(overlapped->handle); + + g_free(overlapped); +} + static int tap_win32_open(tap_win32_overlapped_t **phandle, const char *preferred_name) { @@ -604,7 +625,6 @@ static int tap_win32_open(tap_win32_overlapped_t **phan= dle, unsigned long debug; } version; DWORD version_len; - DWORD idThread; =20 if (preferred_name !=3D NULL) { snprintf(name_buffer, sizeof(name_buffer), "%s", preferred_name); @@ -642,15 +662,22 @@ static int tap_win32_open(tap_win32_overlapped_t **ph= andle, } =20 if (!tap_win32_set_status(handle, TRUE)) { + CloseHandle(handle); return -1; } =20 tap_win32_overlapped_init(&tap_overlapped, handle); =20 - *phandle =3D &tap_overlapped; + tap_overlapped.thread_handle =3D CreateThread(NULL, 0, + tap_win32_thread_entry, (LPVOID)&tap_overlapped, 0, NULL); + + if (tap_overlapped->thread_handle =3D=3D NULL) { + tap_win32_close(tap_overlapped); + return -1; + } + + *phandle =3D tap_overlapped; =20 - CreateThread(NULL, 0, tap_win32_thread_entry, - (LPVOID)&tap_overlapped, 0, &idThread); return 0; } =20 @@ -667,9 +694,8 @@ static void tap_cleanup(NetClientState *nc) =20 qemu_del_wait_object(s->handle->tap_semaphore, NULL, NULL); =20 - /* FIXME: need to kill thread and close file handle: - tap_win32_close(s); - */ + tap_win32_close(s->handle); + s->handle =3D NULL; } =20 static ssize_t tap_receive(NetClientState *nc, const uint8_t *buf, size_t = size) --=20 2.34.1 From nobody Fri Nov 14 16:36:20 2025 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; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1760702631; cv=none; d=zohomail.com; s=zohoarc; b=W8g5xWaf6nIF6XJ3R7k9oXUgYzfQ253e361lq5VachSIabcMRG0zicOWEE1JTkrrWlQupYtjxIKz2aRYLfyI4hHPy3rS47ZA/k0U5bwrf8gEac7SQpC0rJ/TKmzAK7lXiavVuQHhVORSauQq4ptzV5wQXgZZd86lmCi2n3wt1/E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760702631; 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=rt2clKOQFsgO4ZZVeIk/0wwdAAfT+CK0yGEf7GCPm3I=; b=PFMA5IqefGJjmqxuJVurbV7B0q/6Fca8Qmu6IdC9EHHefAUveW6iRvbRH4cNLdDTRsNFllC3wLoYRc7hKQsWi8P8g93vA843LDRkU7gZchQlb2oa352XzXzxSpFc5uwHndHCxwDZjJhe71OV8a4vd9MbFpSEiNycBNmflHw6s60= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17607026313531008.6173971278939; Fri, 17 Oct 2025 05:03:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9jAh-0008O3-Bz; Fri, 17 Oct 2025 08:02:59 -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 1v9j9R-0007c0-Dj for qemu-devel@nongnu.org; Fri, 17 Oct 2025 08:01:41 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v9j7U-0001Bc-GS for qemu-devel@nongnu.org; Fri, 17 Oct 2025 08:01:41 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-471076f819bso14858865e9.3 for ; Fri, 17 Oct 2025 04:59:36 -0700 (PDT) Received: from GAL-PC.localdomain (bzq-79-177-159-123.red.bezeqint.net. [79.177.159.123]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42707b482b3sm3208493f8f.50.2025.10.17.04.59.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Oct 2025 04:59:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760702374; x=1761307174; darn=nongnu.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=rt2clKOQFsgO4ZZVeIk/0wwdAAfT+CK0yGEf7GCPm3I=; b=MAH6DcVGGANcRtotRQcsOQNX4/bE/Vx0O+e7molugpMjJuSHva9SPwm/lpV6Zm+NmV TQIcCfrReQgbcT5XI4NXqSdomClsh/eEonbvSVcnLxWuTjyqfXa4/cMsnp337XRY/lZW QuLgqodIJgcoh6d3ZNsHnjGuoOAnx0Eej9exRaIbZkeOguKkJOo5IbaaXUP7YjrYUmMR qFTLGuDfTwMyWXeFmsBb5O3CozUoPJkb686e/0ZTUiPdtQ/alXp6whTxs4LzDWK7taJg xF1NXZ9hRQV0h/mvFQ8OdGH0zalLtj2IsXCf6PUzgLo3ITbLZ7tZC3Cq7Y2shbtBjh9r 4muA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760702374; x=1761307174; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rt2clKOQFsgO4ZZVeIk/0wwdAAfT+CK0yGEf7GCPm3I=; b=eq5Xq0w5aDqa1NoyRbDYS3/NzfNo0e7HO4T9n8MoPnLCDe2nCBynWxkJkXbgotLdEh HqytaB9kMkrmaaQev4BV7wsXye6xpe3r67H3AgvQtyQwQ+l96ZxU3dSSs5PpkR45LTud hz1i1w6jTNn+VbARk3JqpjE98FPzaHWYiEbRVFyg+gLjUZawQX6XwFzl15KSf9wjTkuk bIgnRogMqMX+310CQIzSYhj1ttuTC6Fl9Kxq5EZXbfba3qYGMcup4Gnxjb0RUBmsyPZS pz5q0gdv76Nz3CeKQ0SGg5JrzVMSo+xUh+OPw49TdUNwxmRQhwjHGpPY3omBhgRP6ZVl VeuQ== X-Gm-Message-State: AOJu0YyqebuQImOzRPC7xG7I7MDCN3xT5wCLCFf3pp/l8S/Jb8VWpLvW KAY133UqqgpwIZUMNEne1v6T0YL428UjFolUPk+sJ6OYtywHgtOhBGs1 X-Gm-Gg: ASbGncv6KOEkJOD+XjLNL/jS5ruIa/FyJa0gu3OHBLfZLDpkgeDqY/LxlNBwU+YxvRt MdjYUg941HUvEXj1qsPXK+pgp0cuRRSoGwjDAG5inCVZ1KvhP0rqTOei/vf8JHCm8h8fEbe05S3 coHGRADFsCb76IfHKh6y9aJ9wVTvMIY0WNGRQp5YovSuddXzoXvqVdwCK4Rf/COCiPN/u6ZWj8R 3wYlT/9G3CgicqWzGIrYOkDj2CY9xJOCyNNSFHfxiAy06LDTV8PP+H6t7MMbJgEcZ31HZKApsPF /tIX0zPvR0mJU0MkCydOl9juPvD6ciMZORG/DP7YjTXeRRF3U2NZviiVYLLRmTF4gYArM4h8hwL xMnQb7YcItQjh5ZLYf9q7Ml2Wm0UxZ995FiJDAvKlLvdCeR7abcyqMnfLnfZx7SDCZHjDGZa5AW oVGqKU5BwKLuf4/NlR8EF42E32mT/jUVHpO58A5GIjhpQ1EW6GVijXE7GgltJm0hFamg== X-Google-Smtp-Source: AGHT+IH6E8kzHJr6m9tqDcPW65zeEbFky2+6pG1Zjq26pZcMpV7s8/vmYlxkYR/YZWeb4S2MklHjZg== X-Received: by 2002:a05:6000:2307:b0:3ed:a43d:e8c4 with SMTP id ffacd0b85a97d-42704d9d03cmr1885392f8f.6.1760702373938; Fri, 17 Oct 2025 04:59:33 -0700 (PDT) From: Gal Horowitz Date: Fri, 17 Oct 2025 14:59:03 +0300 Subject: [PATCH v4 2/2] tap-win32: allocate separate tap state for each instance MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251017-fix-win32-multiple-taps-v4-2-483415799ed8@gmail.com> References: <20251017-fix-win32-multiple-taps-v4-0-483415799ed8@gmail.com> In-Reply-To: <20251017-fix-win32-multiple-taps-v4-0-483415799ed8@gmail.com> To: qemu-devel@nongnu.org Cc: Jason Wang , Stefan Weil , Gal Horowitz X-Mailer: b4 0.14.2 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=2a00:1450:4864:20::32b; envelope-from=galush.horowitz@gmail.com; helo=mail-wm1-x32b.google.com X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 @gmail.com) X-ZM-MESSAGEID: 1760702634925158501 A static global is incorrectly used as the tap state for all win32 taps created. Instead, we now allocate per win32 tap. Signed-off-by: Gal Horowitz --- net/tap-win32.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/net/tap-win32.c b/net/tap-win32.c index ae25e5a883343bf9f570d0f382b8c64712d95242..3d7227fcf47ff45bbdbf60cd5b8= 6ab8f8913b941 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -115,8 +115,6 @@ typedef struct tap_win32_overlapped { tun_buffer_t* output_queue_back; } tap_win32_overlapped_t; =20 -static tap_win32_overlapped_t tap_overlapped; - static tun_buffer_t* get_buffer_from_free_list(tap_win32_overlapped_t* con= st overlapped) { tun_buffer_t* buffer =3D NULL; @@ -403,8 +401,10 @@ static int tap_win32_set_status(HANDLE handle, int sta= tus) &status, sizeof (status), &len, NULL); } =20 -static void tap_win32_overlapped_init(tap_win32_overlapped_t* const overla= pped, const HANDLE handle) +static tap_win32_overlapped_t *tap_win32_overlapped_new(const HANDLE handl= e) { + tap_win32_overlapped_t *overlapped =3D g_new0(tap_win32_overlapped_t, = 1); + overlapped->handle =3D handle; =20 overlapped->read_event =3D CreateEvent(NULL, FALSE, FALSE, NULL); @@ -455,6 +455,8 @@ static void tap_win32_overlapped_init(tap_win32_overlap= ped_t* const overlapped, overlapped->tap_semaphore =3D CreateSemaphore(NULL, 0, TUN_MAX_BUFFER_= COUNT, NULL); if(!overlapped->tap_semaphore) fprintf(stderr, "error creating tap_semaphore.\n"); + + return overlapped; } =20 static int tap_win32_write(tap_win32_overlapped_t *overlapped, @@ -625,6 +627,7 @@ static int tap_win32_open(tap_win32_overlapped_t **phan= dle, unsigned long debug; } version; DWORD version_len; + tap_win32_overlapped_t *tap_overlapped =3D NULL; =20 if (preferred_name !=3D NULL) { snprintf(name_buffer, sizeof(name_buffer), "%s", preferred_name); @@ -666,10 +669,10 @@ static int tap_win32_open(tap_win32_overlapped_t **ph= andle, return -1; } =20 - tap_win32_overlapped_init(&tap_overlapped, handle); + tap_overlapped =3D tap_win32_overlapped_new(handle); =20 - tap_overlapped.thread_handle =3D CreateThread(NULL, 0, - tap_win32_thread_entry, (LPVOID)&tap_overlapped, 0, NULL); + tap_overlapped->thread_handle =3D CreateThread(NULL, 0, + tap_win32_thread_entry, (LPVOID)tap_overlapped, 0, NULL); =20 if (tap_overlapped->thread_handle =3D=3D NULL) { tap_win32_close(tap_overlapped); --=20 2.34.1