From nobody Mon Oct 6 19:22:22 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678105996; cv=none; d=zohomail.com; s=zohoarc; b=Aql0IpPD/fJzbiYkDX5h/3p4UyevAWZwambXru+CMQTgffmXJt7gaXqEv7eYLqWKIuMXIh0Ws4eu/1KJshSGGsSxo7NkEfbQV9rmox4JqFjTk7xrc2EIhYD/gFwYR7DrRfa/gUbT8i2qHAI04Edp6k5dqmmq71Hh6prYVa2METw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678105996; 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=yImVHftO0FYzvgWDZfWuLhBoX9BrfgamfaSJVjQt9As=; b=U+dZF1EpMtyIZwQVS+xfwV2fEB73UgX8/CbFH/Gi8WgusJIiOPilYGR8Zp+2pqqGqlAdvjQX+RnYHPCFRipEEE8qcoY8aQO7P/9rae88sLTggJTk35bNfFp2U7YK4vu5V8PmCthXQQL7ds6Zb91zBx1cRvowxBrrecCcYn6rm+I= 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 1678105995961210.65372991811626; Mon, 6 Mar 2023 04:33:15 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZ9yN-00008R-Ld; Mon, 06 Mar 2023 07:29:49 -0500 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 1pZ9xV-0007iw-F6 for qemu-devel@nongnu.org; Mon, 06 Mar 2023 07:28:57 -0500 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 1pZ9xR-0003MQ-G5 for qemu-devel@nongnu.org; Mon, 06 Mar 2023 07:28:51 -0500 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-410-8hkUvf_eOpOYPE0jSp-ong-1; Mon, 06 Mar 2023 07:28:42 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 935D8857A84; Mon, 6 Mar 2023 12:28:35 +0000 (UTC) Received: from localhost (unknown [10.39.208.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B4EA2026D4B; Mon, 6 Mar 2023 12:28:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678105728; 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=yImVHftO0FYzvgWDZfWuLhBoX9BrfgamfaSJVjQt9As=; b=A35hNYD4cKHBVdUfZhMbRAHW1mSTm4m+QRCzbkNL79/Qc2BpPCVG8ZN6yRMyWyuoBxUAy7 Xr/AUnj62KHMTt5boWxKfoWTykTqYq0oS2lcvUfEnR8xF9zExh+g94HSmSpz6AuGtWANjG JvrnEkoGQdJNHKXrNzPPL41idy6FtGQ= X-MC-Unique: 8hkUvf_eOpOYPE0jSp-ong-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Thomas Huth , Gerd Hoffmann , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Michael Roth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Beraldo Leal , Wainer dos Santos Moschetta , Stefan Weil , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Markus Armbruster , Eric Blake , "Dr. David Alan Gilbert" Subject: [PATCH v4 08/11] qmp: add 'get-win32-socket' Date: Mon, 6 Mar 2023 16:27:48 +0400 Message-Id: <20230306122751.2355515-9-marcandre.lureau@redhat.com> In-Reply-To: <20230306122751.2355515-1-marcandre.lureau@redhat.com> References: <20230306122751.2355515-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.4 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: 1678105996960100005 From: Marc-Andr=C3=A9 Lureau A process with enough capabilities can duplicate a socket to QEMU. Add a QMP command to import it and add it to the monitor fd list, so it can be later used by other commands. Signed-off-by: Marc-Andr=C3=A9 Lureau Acked-by: Markus Armbruster --- qapi/misc.json | 30 ++++++++++++++++++++ monitor/fds.c | 76 +++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 90 insertions(+), 16 deletions(-) diff --git a/qapi/misc.json b/qapi/misc.json index f0217cfba0..031c94050c 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -275,6 +275,36 @@ ## { 'command': 'getfd', 'data': {'fdname': 'str'} } =20 +## +# @get-win32-socket: +# +# Add a socket that was duplicated to QEMU process with WSADuplicateSocket= W() +# via WSASocket() & WSAPROTOCOL_INFOW structure and assign it a name (the = SOCKET +# is associated with a CRT file descriptor) +# +# @info: the WSAPROTOCOL_INFOW structure (encoded in base64) +# +# @fdname: file descriptor name +# +# Returns: Nothing on success +# +# Since: 8.0 +# +# Notes: If @fdname already exists, the file descriptor assigned to +# it will be closed and replaced by the received file +# descriptor. +# +# The 'closefd' command can be used to explicitly close the +# file descriptor when it is no longer needed. +# +# Example: +# +# -> { "execute": "get-win32-socket", "arguments": { "info": "abcd123..", = fdname": "skclient" } } +# <- { "return": {} } +# +## +{ 'command': 'get-win32-socket', 'data': {'info': 'str', 'fdname': 'str'},= 'if': 'CONFIG_WIN32' } + ## # @closefd: # diff --git a/monitor/fds.c b/monitor/fds.c index 7daf1064e1..9ed4197358 100644 --- a/monitor/fds.c +++ b/monitor/fds.c @@ -61,46 +61,55 @@ struct MonFdset { static QemuMutex mon_fdsets_lock; static QLIST_HEAD(, MonFdset) mon_fdsets; =20 -void qmp_getfd(const char *fdname, Error **errp) +static bool monitor_add_fd(Monitor *mon, int fd, const char *fdname, Error= **errp) { - Monitor *cur_mon =3D monitor_cur(); mon_fd_t *monfd; - int fd, tmp_fd; - - fd =3D qemu_chr_fe_get_msgfd(&cur_mon->chr); - if (fd =3D=3D -1) { - error_setg(errp, "No file descriptor supplied via SCM_RIGHTS"); - return; - } =20 if (qemu_isdigit(fdname[0])) { close(fd); error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "fdname", "a name not starting with a digit"); - return; + return false; } =20 /* See close() call below. */ - qemu_mutex_lock(&cur_mon->mon_lock); - QLIST_FOREACH(monfd, &cur_mon->fds, next) { + qemu_mutex_lock(&mon->mon_lock); + QLIST_FOREACH(monfd, &mon->fds, next) { + int tmp_fd; + if (strcmp(monfd->name, fdname) !=3D 0) { continue; } =20 tmp_fd =3D monfd->fd; monfd->fd =3D fd; - qemu_mutex_unlock(&cur_mon->mon_lock); + qemu_mutex_unlock(&mon->mon_lock); /* Make sure close() is outside critical section */ close(tmp_fd); - return; + return true; } =20 monfd =3D g_new0(mon_fd_t, 1); monfd->name =3D g_strdup(fdname); monfd->fd =3D fd; =20 - QLIST_INSERT_HEAD(&cur_mon->fds, monfd, next); - qemu_mutex_unlock(&cur_mon->mon_lock); + QLIST_INSERT_HEAD(&mon->fds, monfd, next); + qemu_mutex_unlock(&mon->mon_lock); + return true; +} + +void qmp_getfd(const char *fdname, Error **errp) +{ + Monitor *cur_mon =3D monitor_cur(); + int fd; + + fd =3D qemu_chr_fe_get_msgfd(&cur_mon->chr); + if (fd =3D=3D -1) { + error_setg(errp, "No file descriptor supplied via SCM_RIGHTS"); + return; + } + + monitor_add_fd(cur_mon, fd, fdname, errp); } =20 void qmp_closefd(const char *fdname, Error **errp) @@ -214,6 +223,41 @@ error: return NULL; } =20 +#ifdef WIN32 +void qmp_get_win32_socket(const char *infos, const char *fdname, Error **e= rrp) +{ + g_autofree WSAPROTOCOL_INFOW *info =3D NULL; + gsize len; + SOCKET sk; + int fd; + + info =3D (void *)g_base64_decode(infos, &len); + if (len !=3D sizeof(*info)) { + error_setg(errp, "Invalid WSAPROTOCOL_INFOW value"); + return; + } + + sk =3D WSASocketW(FROM_PROTOCOL_INFO, + FROM_PROTOCOL_INFO, + FROM_PROTOCOL_INFO, + info, 0, 0); + if (sk =3D=3D INVALID_SOCKET) { + error_setg_win32(errp, WSAGetLastError(), "Couldn't import socket"= ); + return; + } + + fd =3D _open_osfhandle(sk, _O_BINARY); + if (fd < 0) { + error_setg_errno(errp, errno, "Failed to associate a FD with the S= OCKET"); + closesocket(sk); + return; + } + + monitor_add_fd(monitor_cur(), fd, fdname, errp); +} +#endif + + void qmp_remove_fd(int64_t fdset_id, bool has_fd, int64_t fd, Error **errp) { MonFdset *mon_fdset; --=20 2.39.2