From patchwork Wed Mar 11 17:04:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Basil Salman X-Patchwork-Id: 11432269 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A303C13B1 for ; Wed, 11 Mar 2020 17:05:36 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4CA00206BE for ; Wed, 11 Mar 2020 17:05:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=daynix-com.20150623.gappssmtp.com header.i=@daynix-com.20150623.gappssmtp.com header.b="0k6iuWTg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4CA00206BE Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:55894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jC4nW-0007bn-Tf for patchwork-qemu-devel@patchwork.kernel.org; Wed, 11 Mar 2020 13:05:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53045) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jC4mR-0005Pj-E0 for qemu-devel@nongnu.org; Wed, 11 Mar 2020 13:04:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jC4mQ-0000HE-AL for qemu-devel@nongnu.org; Wed, 11 Mar 2020 13:04:27 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:33473) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jC4mP-0000Ds-PP for qemu-devel@nongnu.org; Wed, 11 Mar 2020 13:04:26 -0400 Received: by mail-wr1-x443.google.com with SMTP id a25so3634296wrd.0 for ; Wed, 11 Mar 2020 10:04:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YmXW/SP9doq5sjoE7E/52vrDte/Mf5r4HqcJtOH7zn4=; b=0k6iuWTgJ6/QSPwDmiLJbkthg8AqOt/otdbrLa/gV/AeNHY1NuSlnoz1a+BGHic18K tpE1zo0Yv+OxYl3olx74aDB5+ZvxhfdXp5DSJsYYrXdbWQkn3JCdYt97i0wMB+mgCk5f cMWi+nvPe29+yHBPJxd86uNHxrrU0sFCWdULZFSYFZHPNanle4+KylP2y7R+l5+MfobJ fCHj+uK6bmGDwIBIR5ri/PVYLgUzB8Lnel4CZ6QMbRiDQwuOT0IyHw3qier63EHdEIFL KCdXlSEB7Uu7agQia/bqVf6vTX1LJIG1EYiT9I3n8EIOIXTZbVHCymTVxK39FSpXeJnf I7iA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YmXW/SP9doq5sjoE7E/52vrDte/Mf5r4HqcJtOH7zn4=; b=eAOAnyv9+pBngzRooGUJK2VsZtYBx+orKgWX7AvRLhDj3XZlNmJ/NZn+1WkA+cKicx 5m/P92vqhEKuE3V437f8OrJm9QblbHUft4FwKypyxZ4vfkTRRsA4EvUBce+wKeBEDcAI 67ppviNC4tw2spXkU4J0YcSAmo1zxO8mVlDDzl7IF9ULk1SJPIgnh/dFiFYG1QHlqZVb V0VXmVzs2xW52SDndx/Km0NfBxlkvONLMp/OPjFtBN9bH5d0WRpUC8KmCpVEs/+0OGsH noG3KF4c0qzYpqt/nz7JXsMlHhmbQ2rRelOytXkkyR1p/MLE3ZhYOfNThs2AI0Yx37bO 52Lw== X-Gm-Message-State: ANhLgQ3iIpXKqy2qIRBfYyK5SnOkBN2RNwKBWXxrqgQaz5CSA0CJ3Ucd keUf2DmcJ6+LHvS7L+uB1UWC0eZCijw= X-Google-Smtp-Source: ADFU+vtg/M/VE497TB0LrBcyuO23l+ry5KrFwnEGmLP2RbuDwL8/8gcH4A95HLGH7XpuB4Ha5brDaw== X-Received: by 2002:adf:9b19:: with SMTP id b25mr5437781wrc.368.1583946264116; Wed, 11 Mar 2020 10:04:24 -0700 (PDT) Received: from localhost.localdomain (bzq-84-110-34-91.static-ip.bezeqint.net. [84.110.34.91]) by smtp.gmail.com with ESMTPSA id o26sm8510925wmc.33.2020.03.11.10.04.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Mar 2020 10:04:23 -0700 (PDT) From: Basil Salman To: qemu-devel@nongnu.org, Michael Roth Subject: [PATCH v3 1/3] qga: Installer: Wait for installation to finish Date: Wed, 11 Mar 2020 19:04:15 +0200 Message-Id: <20200311170417.13415-2-basil@daynix.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200311170417.13415-1-basil@daynix.com> References: <20200311170417.13415-1-basil@daynix.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yan Vugenfirer Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Installation might fail if we don't wait for the provider unregisteration process to finish. Signed-off-by: Sameeh Jubran Signed-off-by: Basil Salman Reviewed-by: Philippe Mathieu-Daudé --- qga/installer/qemu-ga.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs index 64bf90bd85..f6781752e6 100644 --- a/qga/installer/qemu-ga.wxs +++ b/qga/installer/qemu-ga.wxs @@ -81,7 +81,7 @@ Arguments="-d --retry-path" > - + From patchwork Wed Mar 11 17:04:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Basil Salman X-Patchwork-Id: 11432271 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DB67C6CA for ; Wed, 11 Mar 2020 17:05:37 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 881FC20736 for ; Wed, 11 Mar 2020 17:05:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=daynix-com.20150623.gappssmtp.com header.i=@daynix-com.20150623.gappssmtp.com header.b="bpEhk+iA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 881FC20736 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:55896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jC4nY-0007gJ-82 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 11 Mar 2020 13:05:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53049) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jC4mR-0005Pm-Mi for qemu-devel@nongnu.org; Wed, 11 Mar 2020 13:04:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jC4mQ-0000Hn-ME for qemu-devel@nongnu.org; Wed, 11 Mar 2020 13:04:27 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:35694) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jC4mQ-0000Gk-Fm for qemu-devel@nongnu.org; Wed, 11 Mar 2020 13:04:26 -0400 Received: by mail-wm1-x342.google.com with SMTP id m3so2986198wmi.0 for ; Wed, 11 Mar 2020 10:04:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=arRHgga2quA2/zACUqHImErod+MeexWEf7WnETjMy7A=; b=bpEhk+iAyW7E0B+pErmDiXNrHI5sn9dD/3/FNx5BbA1vptIa22OvOVJpC390wH1T92 zUqiMbeMIlVHfPGfc2e4vGCb75eXHtlMzNHz9EMyEGrUOZeZx2YZ4goeRDtMOKIn22U3 YyZHkk4enkWiD/MFFwlgcNI5XPzpkTOpTa/YEpGdoqyNTSLUQ8WK5Byw3lnZX1F0lTnt qLATCxGNxB10X0vdFm5YBfIppjTBHmWVDScabKl1M3oxQ5HHb3ETu8L35gaKJ8B7TXRy wUEl+axyWKlqx0x0c/968m8ELSY2UGAJmGHfn441Qkj685RDvkWiK04x/02N7EtV94a1 4YoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=arRHgga2quA2/zACUqHImErod+MeexWEf7WnETjMy7A=; b=lQBOE/YKrl6dv54wRbpdM00O0h9XqmyEySERo0EI08lju+gz4o44Qh+eozRf40wlDr nrJJ9amTaWZ/yVJI5HrRFnquvP+EVt+V9VHnEpgF0G9fjoyevbsl+5OaOXbHVR8d+4Bo gjp1Jc93E9tr+TIOVqxpYO+yjSqQvPIg2aU6GcaaJeWr/jrlLxDE+4wtIi+NYTXWsRj+ j2my2u+kocIQQLhPwLjCF/TP+xfNdSTYrQU7xWtW9tNtpXrxVauMjkJCpjWlP0YhyUm5 +lLflCJ9c5NXVqfP1/wVX1ouzywfMF0EWISmivXPb4WNNUMBL6A8htcTlFsmH/ETO94T fCmw== X-Gm-Message-State: ANhLgQ32ZelgEGu57pFj7mti3cu8xAsfwjjqdkXjAWDg5gNIfOOQoJuJ zS+t528Cf6h8STdHeQ+fWuplnVHm7o4= X-Google-Smtp-Source: ADFU+vsR/IQ4bOQ4gOx1ZAuRzqYn6ng9lpYivfAeCTkh20cwWJnCSi+F3M3NEakqk99j2Mu5SfSxcw== X-Received: by 2002:a7b:c458:: with SMTP id l24mr4538976wmi.120.1583946265196; Wed, 11 Mar 2020 10:04:25 -0700 (PDT) Received: from localhost.localdomain (bzq-84-110-34-91.static-ip.bezeqint.net. [84.110.34.91]) by smtp.gmail.com with ESMTPSA id o26sm8510925wmc.33.2020.03.11.10.04.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Mar 2020 10:04:24 -0700 (PDT) From: Basil Salman To: qemu-devel@nongnu.org, Michael Roth Subject: [PATCH v3 2/3] qga-win: Handle VSS_E_PROVIDER_ALREADY_REGISTERED error Date: Wed, 11 Mar 2020 19:04:16 +0200 Message-Id: <20200311170417.13415-3-basil@daynix.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200311170417.13415-1-basil@daynix.com> References: <20200311170417.13415-1-basil@daynix.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yan Vugenfirer Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Sameeh Jubran This patch handles the case where VSS Provider is already registered, where in such case qga uninstalls the provider and registers it again. Signed-off-by: Sameeh Jubran Signed-off-by: Basil Salman --- qga/vss-win32/install.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp index 6713e58670..a456841360 100644 --- a/qga/vss-win32/install.cpp +++ b/qga/vss-win32/install.cpp @@ -443,6 +443,17 @@ STDAPI DllRegisterServer(void) VSS_PROV_SOFTWARE, const_cast(QGA_PROVIDER_VERSION), g_gProviderVersion); + if (hr == (long int) VSS_E_PROVIDER_ALREADY_REGISTERED) { + DllUnregisterServer(); + hr = pVssAdmin->RegisterProvider(g_gProviderId, CLSID_QGAVSSProvider, + const_cast + (QGA_PROVIDER_LNAME), + VSS_PROV_SOFTWARE, + const_cast + (QGA_PROVIDER_VERSION), + g_gProviderVersion); + } + if (FAILED(hr)) { errmsg_dialog(hr, "RegisterProvider failed"); } From patchwork Wed Mar 11 17:04:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Basil Salman X-Patchwork-Id: 11432273 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7C03C6CA for ; Wed, 11 Mar 2020 17:06:15 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 27C14206BE for ; Wed, 11 Mar 2020 17:06:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=daynix-com.20150623.gappssmtp.com header.i=@daynix-com.20150623.gappssmtp.com header.b="VlS8t4uK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 27C14206BE Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:55904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jC4o9-0000Fg-PN for patchwork-qemu-devel@patchwork.kernel.org; Wed, 11 Mar 2020 13:06:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53077) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jC4mS-0005R9-UW for qemu-devel@nongnu.org; Wed, 11 Mar 2020 13:04:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jC4mR-0000Kp-PN for qemu-devel@nongnu.org; Wed, 11 Mar 2020 13:04:28 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:54038) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jC4mR-0000IP-Hh for qemu-devel@nongnu.org; Wed, 11 Mar 2020 13:04:27 -0400 Received: by mail-wm1-x344.google.com with SMTP id 25so2919949wmk.3 for ; Wed, 11 Mar 2020 10:04:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=eSv9284q8MG06RruZ/p/CHxaIz5RieO9SFvqfvgFmec=; b=VlS8t4uKTaE1Lh2HNc6hKsAWQl/qJcaY0wQLnL76I1DwePEBUYI9EahdcUcp4fHtUC x/REYszirBtyEXqC1vcMzFPkqYxmq+LLp0wk3s9Q/ojXZorR7Jq2kItoa4Ml/DI/3pYw QsE21l/DtcgE0mazB9y4voFHWX8r1niiKSoBxd1sNAlsCqB4t6GSV4SIUXPnOsA1/7e1 V6Epju39TvGtSDUAi48RpR2aGtTrF6LM3rY3jkh5L4hknuJPzkWB9X8wYqCsqlbLOnox Vspz0o71HTEBErmqVaUpL7O7K8YbsbD7w6HmHFjsPBaX4lTySNb4mXD5E5QYB/rXJP35 7ISA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eSv9284q8MG06RruZ/p/CHxaIz5RieO9SFvqfvgFmec=; b=X2VLwhTL37RbAqOUG1u2t2EzGhuHqrS1pOc3lwR2dcrI67xkjBr2pgQyzx5yqPkdAh CbuB+UO9jd+yNdYuPyKRAj/Vd0lVBPmxSEKxFpOtgSwDvB2MvEu41oKM5HeD1aPRTz1w opbXTo0ig16xwFnvGREpWObOXwQG5GqU4H4MOqadHWW6MOx95dXPpPnSxJvgHW2iQPqc EgVEFZU+1YV5NRK3VQ/tD/ld3VTDLiZxAFCAKx+gxpjBAqok/R7F/+HxkwPq21249iFZ Kj5VoFMB99iNx0XCuzMPoQ25oMnx0t5bd7SbzD0g9P9u+tyYVw2i0hqz0iZTzxConEBi OTuA== X-Gm-Message-State: ANhLgQ2pM+M9+C9Ul65BXeiRkUXYxGMEtiEJbpq1v66UgVvTxKKvMXNB y2+XKHelcBo+HCq+WRt5upPuiWkEFVY= X-Google-Smtp-Source: ADFU+vuQIvX2UdDmFMa71OI/yFMNNSs+sBen2t6e+FmtBWKV1j3dK4A12GO2PKmpO5rQuDc8XFUXtQ== X-Received: by 2002:a7b:ce94:: with SMTP id q20mr4472154wmj.157.1583946266327; Wed, 11 Mar 2020 10:04:26 -0700 (PDT) Received: from localhost.localdomain (bzq-84-110-34-91.static-ip.bezeqint.net. [84.110.34.91]) by smtp.gmail.com with ESMTPSA id o26sm8510925wmc.33.2020.03.11.10.04.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Mar 2020 10:04:25 -0700 (PDT) From: Basil Salman To: qemu-devel@nongnu.org, Michael Roth Subject: [PATCH v3 3/3] qga-win: prevent crash when executing guest-file-read with large count Date: Wed, 11 Mar 2020 19:04:17 +0200 Message-Id: <20200311170417.13415-4-basil@daynix.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200311170417.13415-1-basil@daynix.com> References: <20200311170417.13415-1-basil@daynix.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yan Vugenfirer Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" BZ: #1594054 guest-file-read command is currently implemented to read from a file handle count number of bytes. when executed with a very large count number qemu-ga crashes. after some digging turns out that qemu-ga crashes after trying to allocate a buffer large enough to save the data read in it, the buffer was allocated using g_malloc0 which is not fail safe, and results a crash in case of failure. g_malloc0 was replaced with g_try_malloc0() which returns NULL on failure, A check was added for that case in order to prevent qemu-ga from crashing and to send a response to the qemu-ga client accordingly. Signed-off-by: Basil Salman Reported-by: Fakhri Zulkifli --- qga/commands-win32.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 9c744d6405..b49920e201 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -343,7 +343,13 @@ GuestFileRead *qmp_guest_file_read(int64_t handle, bool has_count, } fh = gfh->fh; - buf = g_malloc0(count+1); + buf = g_try_malloc0(count + 1); + if (!buf) { + error_setg(errp, + "failed to allocate sufficient memory " + "to complete the requested service"); + return NULL; + } is_ok = ReadFile(fh, buf, count, &read_count, NULL); if (!is_ok) { error_setg_win32(errp, GetLastError(), "failed to read file");