From nobody Wed May 8 18:13:37 2024 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=1679310930; cv=none; d=zohomail.com; s=zohoarc; b=eZM28xyzTrRHwvUCMtr4kR1sUuAVSNVQs2dcSt8hRQcTGZcJAbZS0/gSLt7T9/6DpqomJoVKN6DW+7AekuvD3mAzzDe50IJ6vnb7BuHW3N9z+LKcYIY9YwOkJVbL4qx9EDn5IcalYlqcwxgKMVQD01nYZykgCNrGLSJDxDn7P/U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679310930; 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=g/+zpFo5O25esCNvHyJH/gFg+unf2DV2qovpTEg/pyI=; b=UWX1AQjLHexPT4blfn4RW1hPwKmZ5VIRwzb5HyI47jWc+gqCYfEruaokaI4krF788i71YGha94LDlty5bc8rEiG2BYdYbQhVFJvVdOndp2gLTki8qDC58/S2BsQYr06vB5e/0DeF4GqEC4W76iSI/lXoLftq/uFvcGU/gv6Rom4= 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 1679310930982327.09643532465543; Mon, 20 Mar 2023 04:15:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peDTA-0000b3-GR; Mon, 20 Mar 2023 07:14:28 -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 1peDT9-0000Z3-77 for qemu-devel@nongnu.org; Mon, 20 Mar 2023 07:14:27 -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 1peDT7-0002ys-LP for qemu-devel@nongnu.org; Mon, 20 Mar 2023 07:14:26 -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-517-PQsNenq5PyC7k1nyI1kKJA-1; Mon, 20 Mar 2023 07:14:20 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6B9B23810B05; Mon, 20 Mar 2023 11:14:20 +0000 (UTC) Received: from localhost (unknown [10.39.208.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4786E492C13; Mon, 20 Mar 2023 11:14:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679310862; 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=g/+zpFo5O25esCNvHyJH/gFg+unf2DV2qovpTEg/pyI=; b=eZ0eqM7HZQ9hNdsTu7CCYSw2xS/vlo0Uym0gPiomVDNq0JeHRD89feFMzT2xn8DmAgcDs3 nOZLWHsD6VCG1AwUw8Df3WtTzjzbWk706kYlY9MqOYUZL6a8LqZJcLSnCizhZrrhxNaUeI R4LG7aaVwGS8wzDaLf/5I7dDnNRjby0= X-MC-Unique: PQsNenq5PyC7k1nyI1kKJA-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 1/3] win32: add qemu_close_to_socket() Date: Mon, 20 Mar 2023 15:14:10 +0400 Message-Id: <20230320111412.1516419-2-marcandre.lureau@redhat.com> In-Reply-To: <20230320111412.1516419-1-marcandre.lureau@redhat.com> References: <20230320111412.1516419-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.9 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: 1679310932831100003 From: Marc-Andr=C3=A9 Lureau Close the given file descriptor, but returns the underlying SOCKET. Signed-off-by: Marc-Andr=C3=A9 Lureau --- include/sysemu/os-win32.h | 1 + util/oslib-win32.c | 68 +++++++++++++++++++++------------------ 2 files changed, 38 insertions(+), 31 deletions(-) diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h index e2849f88ab..95cba6b284 100644 --- a/include/sysemu/os-win32.h +++ b/include/sysemu/os-win32.h @@ -174,6 +174,7 @@ bool qemu_socket_unselect(int sockfd, Error **errp); /* We wrap all the sockets functions so that we can * set errno based on WSAGetLastError() */ +SOCKET qemu_close_to_socket(int fd); =20 #undef close #define close qemu_close_wrap diff --git a/util/oslib-win32.c b/util/oslib-win32.c index 16f8a67f7e..e37276b414 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -479,52 +479,58 @@ int qemu_bind_wrap(int sockfd, const struct sockaddr = *addr, return ret; } =20 - #undef close -int qemu_close_wrap(int fd) +SOCKET qemu_close_to_socket(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); =20 - /* - * 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; - } - - 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 INVALID_SOCKET; } =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; + return INVALID_SOCKET; } =20 /* * 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 INVALID_SOCKET; + } + + if (!SetHandleInformation((HANDLE)s, flags, flags)) { + errno =3D EACCES; + return INVALID_SOCKET; + } + + return s; +} + +int qemu_close_wrap(int fd) +{ + SOCKET s =3D INVALID_SOCKET; + int ret =3D -1; + + if (!fd_is_socket(fd)) { + return close(fd); } =20 + s =3D qemu_close_to_socket(fd); + if (s !=3D INVALID_SOCKET) { ret =3D closesocket(s); if (ret < 0) { --=20 2.39.2 From nobody Wed May 8 18:13:37 2024 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=1679310899; cv=none; d=zohomail.com; s=zohoarc; b=Ijs9ngi2kp5T9lfKuQb/oy0ZRdc/+LCz9+anrL45SlSTz3to9g/a4QvwJ8ej5jIpa11zIEnBM4XO1sQvXZVW/9sNnJaQuWm0kUS8/TncQpupEtctuZ0FjBhiI0AzGJl1f+iPFTA3S78FSUURaYiBawP2FsTVDEL4UmDAGgIib/M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679310899; 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=8rR89k6AMkUcW+9BURWSfuYJ6CylXJO0eebhaooAur8=; b=hH85gFdiKKi1AYgm1IMxN9FHMEr99DdZhwqnKXADKgPYkegWIX+FOOJKf16ZmMoSt4TumwsFXBVJSAgeE1iUZ5TAgJs2PWkzFt8wDxr/fYUd6WFHhl2LEK6PS9jSwhsweVISjkkxzD8QQwLnX/LbZEvcTQk/JE65+W72xxmp5cA= 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 1679310899604385.6440342546225; Mon, 20 Mar 2023 04:14:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peDTH-0000cs-DY; Mon, 20 Mar 2023 07:14:35 -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 1peDTF-0000cb-Jc for qemu-devel@nongnu.org; Mon, 20 Mar 2023 07:14:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peDTE-00030u-50 for qemu-devel@nongnu.org; Mon, 20 Mar 2023 07:14:33 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-322-a42FSMj3PC-nvgogiktpVw-1; Mon, 20 Mar 2023 07:14:25 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 24E6688B77D; Mon, 20 Mar 2023 11:14:25 +0000 (UTC) Received: from localhost (unknown [10.39.208.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 35B02C15BA0; Mon, 20 Mar 2023 11:14:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679310871; 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=8rR89k6AMkUcW+9BURWSfuYJ6CylXJO0eebhaooAur8=; b=jH7e79YmckLt+9JLgQxqxS87o1LmqkUEpA0CNoMQftY78v+wX0D9b7IeMEWBDle2gAQRid Ijlqefs4rYpIw1/SwlW3pbjdRaAxHf5Y7lawmEQmkcnq53vgbtPHbv6NEoJTfsPOISest5 ynnki9nVSzfV4Dp1iFqMnNR67saFEiI= X-MC-Unique: a42FSMj3PC-nvgogiktpVw-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 2/3] ui/spice: fix SOCKET handling regression Date: Mon, 20 Mar 2023 15:14:11 +0400 Message-Id: <20230320111412.1516419-3-marcandre.lureau@redhat.com> In-Reply-To: <20230320111412.1516419-1-marcandre.lureau@redhat.com> References: <20230320111412.1516419-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.8 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.133.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: 1679310900646100003 From: Marc-Andr=C3=A9 Lureau Spice uses SOCKET on win32, but QEMU now uses file-descriptors. Fixes "8.0.0rc0 Regression: spicy windows doesn't open": https://gitlab.com/qemu-project/qemu/-/issues/1549 Fixes: commit abe34282b ("win32: avoid mixing SOCKET and file descriptor sp= ace") Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Daniel P. Berrang=C3=A9 --- ui/spice-core.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/ui/spice-core.c b/ui/spice-core.c index b05c830086..e84ebe4a3f 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -90,13 +90,23 @@ struct SpiceWatch { static void watch_read(void *opaque) { SpiceWatch *watch =3D opaque; - watch->func(watch->fd, SPICE_WATCH_EVENT_READ, watch->opaque); + int fd =3D watch->fd; + +#ifdef WIN32 + fd =3D _get_osfhandle(fd); +#endif + watch->func(fd, SPICE_WATCH_EVENT_READ, watch->opaque); } =20 static void watch_write(void *opaque) { SpiceWatch *watch =3D opaque; - watch->func(watch->fd, SPICE_WATCH_EVENT_WRITE, watch->opaque); + int fd =3D watch->fd; + +#ifdef WIN32 + fd =3D _get_osfhandle(fd); +#endif + watch->func(fd, SPICE_WATCH_EVENT_WRITE, watch->opaque); } =20 static void watch_update_mask(SpiceWatch *watch, int event_mask) @@ -117,6 +127,14 @@ static SpiceWatch *watch_add(int fd, int event_mask, S= piceWatchFunc func, void * { SpiceWatch *watch; =20 +#ifdef WIN32 + fd =3D _open_osfhandle(fd, _O_BINARY); + if (fd < 0) { + error_setg_win32(&error_warn, WSAGetLastError(), "Couldn't associa= te a FD with the SOCKET"); + return NULL; + } +#endif + watch =3D g_malloc0(sizeof(*watch)); watch->fd =3D fd; watch->func =3D func; @@ -129,6 +147,10 @@ static SpiceWatch *watch_add(int fd, int event_mask, S= piceWatchFunc func, void * static void watch_remove(SpiceWatch *watch) { qemu_set_fd_handler(watch->fd, NULL, NULL, NULL); +#ifdef WIN32 + /* SOCKET is owned by spice */ + qemu_close_to_socket(watch->fd); +#endif g_free(watch); } =20 @@ -908,6 +930,9 @@ static int qemu_spice_set_pw_expire(time_t expires) =20 static int qemu_spice_display_add_client(int csock, int skipauth, int tls) { +#ifdef WIN32 + csock =3D qemu_close_to_socket(csock); +#endif if (tls) { return spice_server_add_ssl_client(spice_server, csock, skipauth); } else { --=20 2.39.2 From nobody Wed May 8 18:13:37 2024 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=1679310937; cv=none; d=zohomail.com; s=zohoarc; b=fi5IhIHhcwrtRsiI4aWTQvPeQutjXfNQnB+L++UY+iuSTTDMejZ+79dIW8tO1KfpXqFAPzob11VPBbhMQBz+7waNq7E/NVNVhmDL1czUEXuaJY2S8X30Nr3LQkQtDMWc34XF8rcyo7dU0GLU7sTkW5IrKAqYKpA6a5web47t4fI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679310937; 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=k5ric0u+KBFd+a5PgFmmEkkfokYS8eoybV5l22EaY8w=; b=O/KvX9ksTOGsBXbC/WWZiEgE5z+F3YwEapw4k9Utb2joETjJ+XOgDc5VN3Fxij1klcG+WVVLPglykgG6Ggg2P/PyXWu7H0Hnztr2BajlGtRC477+oJECxToPkcVUdluqTDBLLzdKfMbmlBVlYMprWfapzNvQk3U+UCyWI2dl2kY= 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 1679310936934548.1000011248366; Mon, 20 Mar 2023 04:15:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peDTJ-0000eF-0M; Mon, 20 Mar 2023 07:14: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 1peDTG-0000ck-4a for qemu-devel@nongnu.org; Mon, 20 Mar 2023 07:14:35 -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 1peDTE-000314-Rp for qemu-devel@nongnu.org; Mon, 20 Mar 2023 07:14:33 -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-615-nAJX0hWXPEmaAAaLRfUNZg-1; Mon, 20 Mar 2023 07:14:29 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BA17529A9CA3; Mon, 20 Mar 2023 11:14:28 +0000 (UTC) Received: from localhost (unknown [10.39.208.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 003932166B29; Mon, 20 Mar 2023 11:14:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679310872; 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=k5ric0u+KBFd+a5PgFmmEkkfokYS8eoybV5l22EaY8w=; b=IW6IixrdLue+1V5tX/iJiGqbGCHCsAYiqyuFs1L93bnA2SaEoWCCb5YosoNsGlzjht4AR2 49MZKRBhmC+g+wc6rYMmWXJ5q2lg9FGDvaS32M1tD7i8QoO6+FSuX2FaJpqC919TgN1Us8 WdaJyaAYh/PUvGrTjWfY3Bww3ijPAUo= X-MC-Unique: nAJX0hWXPEmaAAaLRfUNZg-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 3/3] ui/dbus: fix passing SOCKET to GSocket API & leak Date: Mon, 20 Mar 2023 15:14:12 +0400 Message-Id: <20230320111412.1516419-4-marcandre.lureau@redhat.com> In-Reply-To: <20230320111412.1516419-1-marcandre.lureau@redhat.com> References: <20230320111412.1516419-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.6 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: 1679310938865100003 From: Marc-Andr=C3=A9 Lureau -display dbus is not currently available to win32 users, so it's not considered a regression. Note also the close() leak fix in case of error. Signed-off-by: Marc-Andr=C3=A9 Lureau --- ui/dbus.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ui/dbus.c b/ui/dbus.c index 0513de9918..5389ac493f 100644 --- a/ui/dbus.c +++ b/ui/dbus.c @@ -304,9 +304,17 @@ dbus_display_add_client(int csock, Error **errp) g_cancellable_cancel(dbus_display->add_client_cancellable); } =20 +#ifdef WIN32 + csock =3D qemu_close_to_socket(csock); +#endif socket =3D g_socket_new_from_fd(csock, &err); if (!socket) { error_setg(errp, "Failed to setup D-Bus socket: %s", err->message); +#ifdef WIN32 + closesocket(csock); +#else + close(csock); +#endif return false; } =20 --=20 2.39.2