From nobody Thu Nov 6 12:14:39 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 154095055175854.31915166797842; Tue, 30 Oct 2018 18:49:11 -0700 (PDT) Received: from localhost ([::1]:56623 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHfd8-0000Ew-HX for importer@patchew.org; Tue, 30 Oct 2018 21:49:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60375) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHfUu-0000Z5-SS for qemu-devel@nongnu.org; Tue, 30 Oct 2018 21:40:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gHfUt-0002IZ-GL for qemu-devel@nongnu.org; Tue, 30 Oct 2018 21:40:40 -0400 Received: from mail-qt1-x832.google.com ([2607:f8b0:4864:20::832]:35453) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gHfUt-0002HO-7m for qemu-devel@nongnu.org; Tue, 30 Oct 2018 21:40:39 -0400 Received: by mail-qt1-x832.google.com with SMTP id a10-v6so15979256qtp.2 for ; Tue, 30 Oct 2018 18:40:38 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id u16sm343407qkg.14.2018.10.30.18.40.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Oct 2018 18:40:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=b60sY/Qw6hLNM3jT0LJpKmQaEbzVAgZEFb44f/LeZZA=; b=JLnCa5Qsz47oAgJ123bBFGm/erfROu2XS+mKcGJu32py4DzoPMe5ewz4PtQPFnt5DU xq9OJlTiVaKp9P4ygOGXl+JmJGpu6KdihNxMYGOlKDPQXz3lfv24QDoVnX/hIbSVuhJs GpsEfUge88S+6oFCKEcRSZLjijg57kuews43rE6mmgOkHo4J+Y7KkNJTHexbkfgq8Oy1 KxnGeYRC7NUKJsnBSICOnt/GAdn4eiAAuYjd5ZVTBVbBV1RPwF8bQtfr02BpWUF4Y5uy tjE+kV17qm4YlQr+0QssanEagc7wBdTBPa94+r1aHNtCzsiNajt0az9sk9nCzknjaBz9 4sFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=b60sY/Qw6hLNM3jT0LJpKmQaEbzVAgZEFb44f/LeZZA=; b=reJ8TtlJlVEiphs7FQYH3fsP0ixs7tvAArpw0c93Fa5Cxobff4+bgzLNpSRtwfJ0BC E1KJjHCr5JcGr7VOMAh7JeNa9K50faeiXJC9Chq+QPZ0jy+JSx4c5fSxiJlDlqRukRH5 x5bfRkHebpzZJmpAYzb9nKuEhNkmUNI3DmePhtyxvdmgKLr/vvc7HLghjI5ZWCAQfc76 o58zQEDAUoAayd4PIDtV7TId0rRLOCQEpUSRybeE/OnXj1iKH1HeagArWYkFE5XLVYS1 xqFOZWgGnFEfiDl2NGIMamQByWbzSalHJLgTGmoCO3z9nkxMTu3Ntg+EFDg5J70N8RLd aKYw== X-Gm-Message-State: AGRZ1gLfOw2/2tjWUAPhsv5aDokUG5s0Wu40fwBiIPoWGKzTO7H/uIGY IZBYGeuAV4BCqv6yhv96a6N8J2ZH X-Google-Smtp-Source: AJdET5dXKGJyJcVc/naorEYSuGk/bZ0NL/Lk1dx3n431gbhdC1BUd+b/H+clgtalKL0T3VTlLuXC3A== X-Received: by 2002:ac8:41c8:: with SMTP id o8mr994871qtm.232.1540950037370; Tue, 30 Oct 2018 18:40:37 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 30 Oct 2018 20:37:58 -0500 Message-Id: <20181031013821.24023-2-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181031013821.24023-1-mdroth@linux.vnet.ibm.com> References: <20181031013821.24023-1-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::832 Subject: [Qemu-devel] [PULL v2 01/24] qga: Support Unicode paths in guest-file-open on win32 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jonathon Reinhart , peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Jonathon Reinhart Currently, the win32 port of QEMU Guest Agent does not properly handle Unic= ode paths. The JSON decoder produces a valid UTF-8 path string, but this is pas= sed directly to CreateFileA, which is expecting an ANSI string and not UTF-8. T= his leads to mangled filenames. This patch follows the example of qmp_guest_set_user_password() and uses g_utf8_to_utf16() to convert the string to UTF-16 and calls CreateFileW() explicitly. Signed-off-by: Jonathon Reinhart Signed-off-by: Michael Roth --- qga/commands-win32.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 98d9735389..416343b97b 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -160,13 +160,15 @@ static void handle_set_nonblocking(HANDLE fh) int64_t qmp_guest_file_open(const char *path, bool has_mode, const char *mode, Error **errp) { - int64_t fd; + int64_t fd =3D -1; HANDLE fh; HANDLE templ_file =3D NULL; DWORD share_mode =3D FILE_SHARE_READ; DWORD flags_and_attr =3D FILE_ATTRIBUTE_NORMAL; LPSECURITY_ATTRIBUTES sa_attr =3D NULL; OpenFlags *guest_flags; + GError *gerr =3D NULL; + wchar_t *w_path =3D NULL; =20 if (!has_mode) { mode =3D "r"; @@ -175,16 +177,21 @@ int64_t qmp_guest_file_open(const char *path, bool ha= s_mode, guest_flags =3D find_open_flag(mode); if (guest_flags =3D=3D NULL) { error_setg(errp, "invalid file open mode"); - return -1; + goto done; + } + + w_path =3D g_utf8_to_utf16(path, -1, NULL, NULL, &gerr); + if (!w_path) { + goto done; } =20 - fh =3D CreateFile(path, guest_flags->desired_access, share_mode, sa_at= tr, + fh =3D CreateFileW(w_path, guest_flags->desired_access, share_mode, sa= _attr, guest_flags->creation_disposition, flags_and_attr, templ_file); if (fh =3D=3D INVALID_HANDLE_VALUE) { error_setg_win32(errp, GetLastError(), "failed to open file '%s'", path); - return -1; + goto done; } =20 /* set fd non-blocking to avoid common use cases (like reading from a @@ -196,10 +203,17 @@ int64_t qmp_guest_file_open(const char *path, bool ha= s_mode, if (fd < 0) { CloseHandle(fh); error_setg(errp, "failed to add handle to qmp handle table"); - return -1; + goto done; } =20 slog("guest-file-open, handle: % " PRId64, fd); + +done: + if (gerr) { + error_setg(errp, QERR_QGA_COMMAND_FAILED, gerr->message); + g_error_free(gerr); + } + g_free(w_path); return fd; } =20 --=20 2.17.1