From nobody Mon Feb 9 23:58:16 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1679319457; cv=none; d=zohomail.com; s=zohoarc; b=IfaySagOoedg9HC/BXNq4I+v6d8ALEHqo3kCHeX6BSkE3okHlxNrhJD3EpEcyCIA6lhjsI9ROJgu5tAGeqGOKCNF8NY9l4fN51wP8rsKy9JZbpiIDNgNnaCjVexn2EAQZW3BarMnHjgCOAI18snwL/kTFA3c1uZtkGDIAg+KMLk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679319457; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MxFVrjr23RmzfOH4M1hN0g7VfzXGELnKdK7ZPeHxp1s=; b=Rwql8CnqK5YDkEW+xGm6mbplko/vGwt9utd4rKMfeZjI+IfhAJ6amPEbsdrYN1fvOExqY0Zp9wVgIPBHlyCRiBtZvrgVGj/s4iUB4WIp3S4zMntA0vj8cJ2vgYqrBRYFsTwnXZLPykESAEOE/kkoqZtp1WEju+xVZpeak5WakOw= 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 1679319457077188.84400056269305; Mon, 20 Mar 2023 06:37:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peFh5-0002y8-Ec; Mon, 20 Mar 2023 09:36: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 1peFh3-0002xx-TA for qemu-devel@nongnu.org; Mon, 20 Mar 2023 09:36:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peFh2-0000CA-8d for qemu-devel@nongnu.org; Mon, 20 Mar 2023 09:36:57 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-367-frx-olMWMZ6eSxMcpBWhPg-1; Mon, 20 Mar 2023 09:36:52 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F1E8D1C05EB6; Mon, 20 Mar 2023 13:36:51 +0000 (UTC) Received: from localhost (unknown [10.39.208.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF05640C83B6; Mon, 20 Mar 2023 13:36:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679319415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MxFVrjr23RmzfOH4M1hN0g7VfzXGELnKdK7ZPeHxp1s=; b=ghapp8R6t4IAPZdZsWE1n/DV95hK7IJO4H7eA9MMpb3ofn/FGgiNINVkqa1k4Jvs2z5Uc9 h4GAvA0I99pgR124EXf8pRe54pIO5h0IGIp3+kTEkaVk5eP1E/HllXwhjgdpGaRspv0qW8 eD66dnlGmwyiAsrF1NXbg+gUNTIrP1o= X-MC-Unique: frx-olMWMZ6eSxMcpBWhPg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Stefan Weil , berrange@redhat.com, Gerd Hoffmann Subject: [PATCH v2 1/3] win32: add qemu_close_socket_osfhandle() Date: Mon, 20 Mar 2023 17:36:41 +0400 Message-Id: <20230320133643.1618437-2-marcandre.lureau@redhat.com> In-Reply-To: <20230320133643.1618437-1-marcandre.lureau@redhat.com> References: <20230320133643.1618437-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=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: 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 @redhat.com) X-ZM-MESSAGEID: 1679319458226100011 From: Marc-Andr=C3=A9 Lureau Close the given file descriptor, but returns the underlying SOCKET. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Daniel P. Berrang=C3=A9 --- include/sysemu/os-win32.h | 15 ++++++-- util/oslib-win32.c | 75 +++++++++++++++++++++------------------ 2 files changed, 53 insertions(+), 37 deletions(-) diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h index e2849f88ab..15c296e0eb 100644 --- a/include/sysemu/os-win32.h +++ b/include/sysemu/os-win32.h @@ -171,10 +171,21 @@ bool qemu_socket_select(int sockfd, WSAEVENT hEventOb= ject, =20 bool qemu_socket_unselect(int sockfd, Error **errp); =20 -/* We wrap all the sockets functions so that we can - * set errno based on WSAGetLastError() +/* We wrap all the sockets functions so that we can set errno based on + * WSAGetLastError(), and use file-descriptors instead of SOCKET. */ =20 +/* + * qemu_close_socket_osfhandle: + * @fd: a file descriptor associated with a SOCKET + * + * Close only the C run-time file descriptor, leave the SOCKET opened. + * + * Returns zero on success. On error, -1 is returned, and errno is set to + * indicate the error. + */ +int qemu_close_socket_osfhandle(int fd); + #undef close #define close qemu_close_wrap int qemu_close_wrap(int fd); diff --git a/util/oslib-win32.c b/util/oslib-win32.c index 16f8a67f7e..a98638729a 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -479,40 +479,27 @@ int qemu_bind_wrap(int sockfd, const struct sockaddr = *addr, return ret; } =20 - #undef close -int qemu_close_wrap(int fd) +int qemu_close_socket_osfhandle(int fd) { - int ret; + SOCKET s =3D _get_osfhandle(fd); DWORD flags =3D 0; - SOCKET s =3D INVALID_SOCKET; - - if (fd_is_socket(fd)) { - s =3D _get_osfhandle(fd); - - /* - * If we were to just call _close on the descriptor, it would clos= e the - * HANDLE, but it wouldn't free any of the resources associated to= the - * SOCKET, and we can't call _close after calling closesocket, bec= ause - * closesocket has already closed the HANDLE, and _close would att= empt to - * close the HANDLE again, resulting in a double free. We can howe= ver - * protect the HANDLE from actually being closed long enough to cl= ose the - * file descriptor, then close the socket itself. - */ - if (!GetHandleInformation((HANDLE)s, &flags)) { - errno =3D EACCES; - return -1; - } =20 - if (!SetHandleInformation((HANDLE)s, HANDLE_FLAG_PROTECT_FROM_CLOS= E, HANDLE_FLAG_PROTECT_FROM_CLOSE)) { - errno =3D EACCES; - return -1; - } + /* + * If we were to just call _close on the descriptor, it would close the + * HANDLE, but it wouldn't free any of the resources associated to the + * SOCKET, and we can't call _close after calling closesocket, because + * closesocket has already closed the HANDLE, and _close would attempt= to + * close the HANDLE again, resulting in a double free. We can however + * protect the HANDLE from actually being closed long enough to close = the + * file descriptor, then close the socket itself. + */ + if (!GetHandleInformation((HANDLE)s, &flags)) { + errno =3D EACCES; + return -1; } =20 - ret =3D close(fd); - - if (s !=3D INVALID_SOCKET && !SetHandleInformation((HANDLE)s, flags, f= lags)) { + if (!SetHandleInformation((HANDLE)s, HANDLE_FLAG_PROTECT_FROM_CLOSE, H= ANDLE_FLAG_PROTECT_FROM_CLOSE)) { errno =3D EACCES; return -1; } @@ -521,15 +508,33 @@ int qemu_close_wrap(int fd) * close() returns EBADF since we PROTECT_FROM_CLOSE the underlying ha= ndle, * but the FD is actually freed */ - if (ret < 0 && (s =3D=3D INVALID_SOCKET || errno !=3D EBADF)) { - return ret; + if (close(fd) < 0 && errno !=3D EBADF) { + return -1; } =20 - if (s !=3D INVALID_SOCKET) { - ret =3D closesocket(s); - if (ret < 0) { - errno =3D socket_error(); - } + if (!SetHandleInformation((HANDLE)s, flags, flags)) { + errno =3D EACCES; + return -1; + } + + return 0; +} + +int qemu_close_wrap(int fd) +{ + SOCKET s =3D INVALID_SOCKET; + int ret =3D -1; + + if (!fd_is_socket(fd)) { + return close(fd); + } + + s =3D _get_osfhandle(fd); + qemu_close_socket_osfhandle(fd); + + ret =3D closesocket(s); + if (ret < 0) { + errno =3D socket_error(); } =20 return ret; --=20 2.39.2