From nobody Fri Mar 29 07:32:09 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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 ARC-Seal: i=1; a=rsa-sha256; t=1585071031; cv=none; d=zohomail.com; s=zohoarc; b=CIKQlH48fkO0jQ1VMSKiGwaiOze7Fo3hpp6Lx2nXNPnk6Oc2DBJOtPI+K2BInC/8v/dZ5xXProDe2MtPW9XGIhD2Slra/s/X/3I+JVQWg9NBHI76LTimLElJT03VHqRlvMT16YaEcHRPcymvS7hP6vWAwU/qLtwqsenTE6eK16M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585071031; 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=4ZGYIL2rqF2T6FtQL+8Y3D7X7iQJLL9+ey7r6yaKFq4=; b=gprBwe3veevqZ5W/Ozu2HewLD7faX8msl28bHXxVH7rmrgQRWCUAwDm7mbzrRJXo9QQOIrCCoFdMKfCSj8bF3EozZYIpx4WBooD2zBiu9CPzr/syCvwh2S4J0fn82X1dXuQbSCOZQ3QxAMMXUzlqVcc1872iTnZmRxzcpZERqfM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585071031947475.42866949843767; Tue, 24 Mar 2020 10:30:31 -0700 (PDT) Received: from localhost ([::1]:52640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGnNm-0001dC-Iu for importer@patchew.org; Tue, 24 Mar 2020 13:30:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52293) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGmoK-00064o-Ob for qemu-devel@nongnu.org; Tue, 24 Mar 2020 12:53:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGmoJ-0002eo-QA for qemu-devel@nongnu.org; Tue, 24 Mar 2020 12:53:52 -0400 Received: from mail-yb1-xb33.google.com ([2607:f8b0:4864:20::b33]:35487) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jGmoJ-0002eU-MI for qemu-devel@nongnu.org; Tue, 24 Mar 2020 12:53:51 -0400 Received: by mail-yb1-xb33.google.com with SMTP id x63so9530376ybx.2 for ; Tue, 24 Mar 2020 09:53:51 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id z22sm339615oog.45.2020.03.24.09.47.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Mar 2020 09:47:40 -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 :mime-version:content-transfer-encoding; bh=4ZGYIL2rqF2T6FtQL+8Y3D7X7iQJLL9+ey7r6yaKFq4=; b=bnvckj4eijjAchZuVR2iwSPdNl+Na2EGXQ7USWzj1MlJsmWerWntSp4uTTN/bzMXo5 XcwWYMBur3xbprhRceR2Pz3U6hBDEfs222HgZhbOL9M4Jb+0JuF+5J+alGbYWOpjklqY 5rQb/GK4UTibLS+udVVrttFvDgvLLUxABQyByN85W35rEy8uNU/KwlrE4OSleiZh7+e8 gm+pMO1KNsDTMGD8ukriztvalvXMMbgf9NCDFiOkM/d2rCd9eAdKe3yXVKcGS6KWEszD VPyrwWw/91+CJ8RFQ0Mf1hTMkhJ6QD4n1PnA5BKwjqZHlX5yRgFM7zj5trRuseSQkov0 Y+2g== 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:mime-version:content-transfer-encoding; bh=4ZGYIL2rqF2T6FtQL+8Y3D7X7iQJLL9+ey7r6yaKFq4=; b=J+5NDuisF6fkw0P4C/0ZKxE8f8T6rriM7BhEDsJ/BSN49MNEGFOqEs6Rbj6lm+aXn6 sz1JvOH1zoOUd+wUJgfpKspsCuMuOFhlra3W3eDCgzjljEgsj5n9FcwYj0u7nCJt5Jbr auz/k3/ZrQreCGaKZFqrP2O5GhQiREU/ITtYv7mRRpPVz4uq7Kg3kLWpkxQr0vFF/BZT eysMx6s5jepC6dxITlVckHgd8YOV04JPvkdKEVcqivmSUDfMxlxNUllf5ZukXK2VGjCk HJ3bq1W2mcmRd7zf2g8WeMdX14xoXJ0pL64M/u/4ZLhn7ZmV864ozp+I5na+apgTv8Ip kBFg== X-Gm-Message-State: ANhLgQ2xUdQ6Wt7b45Jn9PVP02/JJZ0CjTT71vC4mJTOC9cDbqs03ZYM jsgwN6CdowB2fcieW29pY2pkoVsI4Rg= X-Google-Smtp-Source: ADFU+vv3MsaBfr6KUtBVatPkxA9nAtP39hB0fboEoLwTU5jFqfSQrFElksaelS5yFKySqiIdqwIguQ== X-Received: by 2002:a05:6830:1d95:: with SMTP id y21mr6324574oti.180.1585068461964; Tue, 24 Mar 2020 09:47:41 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Subject: [PULL for-5.0 1/5] qga: Installer: Wait for installation to finish Date: Tue, 24 Mar 2020 11:46:49 -0500 Message-Id: <20200324164653.19449-2-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200324164653.19449-1-mdroth@linux.vnet.ibm.com> References: <20200324164653.19449-1-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::b33 X-Mailman-Approved-At: Tue, 24 Mar 2020 13:24:24 -0400 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: Sameeh Jubran , peter.maydell@linaro.org, Basil Salman Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Basil Salman 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=C3=A9 Signed-off-by: Michael Roth --- 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=3D"-d --retry-path" > - + --=20 2.17.1 From nobody Fri Mar 29 07:32:09 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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 ARC-Seal: i=1; a=rsa-sha256; t=1585070706; cv=none; d=zohomail.com; s=zohoarc; b=g+NhKZV3MBJAKmUQ57eGQRpxCMCRzAPj/7fDSG39GaaGxfxvHBtC/GafIJoe7TzuYIr8IlkNJ4+k28pKLu7dFvf4l+zKYI299rJBGEbwiJT7yg8L2Aarko7A7DEIEcL4h8fSDjYDAS9gLfxwdAgopWm6y7Xf+Cj2Nu6nOzxsmW8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585070706; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=WZwD83D9KTX1uO8cXedRJd4vyXXnAoxqc7Y/V7iuhWE=; b=MbugVTtxHh8N3GMM0cBUo2q+AwzowWsoYhtdDii1Vfkx3n/PB+24mwDnI9veNQ+XyD8oToHjqLCZAYaaTqqYDLw/BQdzQcjMaEfR85Rcvb3Wgh8TT/SViFF84vFiGRIldy/VHyno3JpVwaQ39O2dbKiuMABF9plUQxDSqylG0xY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585070706240312.5813159869839; Tue, 24 Mar 2020 10:25:06 -0700 (PDT) Received: from localhost ([::1]:52542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGnIW-0002ja-Qc for importer@patchew.org; Tue, 24 Mar 2020 13:25:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51071) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGmiQ-0003S6-8g for qemu-devel@nongnu.org; Tue, 24 Mar 2020 12:47:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGmiP-0007u9-AH for qemu-devel@nongnu.org; Tue, 24 Mar 2020 12:47:46 -0400 Received: from mail-oi1-x234.google.com ([2607:f8b0:4864:20::234]:41717) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jGmiP-0007tW-5p for qemu-devel@nongnu.org; Tue, 24 Mar 2020 12:47:45 -0400 Received: by mail-oi1-x234.google.com with SMTP id k9so6476939oia.8 for ; Tue, 24 Mar 2020 09:47:45 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id u199sm6426273oif.25.2020.03.24.09.47.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Mar 2020 09:47:42 -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=WZwD83D9KTX1uO8cXedRJd4vyXXnAoxqc7Y/V7iuhWE=; b=Wxt5Cw3MmT9nr/AJwJ+2oNXZzFTqnx3JUIgmQG4IUJ6rlCGcxa2ccIk2051uXdoTkS Ki4Vfx7sxV4xJWL+tOnp2EsVG7n2zpJDNcH+sws4p7ghwpOiFbWmDmfMO30omM2FyMdn 8njSrLoQHA+vuy3KaH3E4sJuwei1IEz2aZ/Jeq3+kfnPtWKsq35xYy4eGbYIdyRPWklh qfyCwnhR3/npT/4eFEEvQ5EblglSqresVBQpI0zpDXcH8hbzQlr5kp2Zw4MoBCJGTZ42 sG16G3UpSEcpQ2XcQEPB7W1f3BiHxp/ZfvVY1EnFEP5DPEEtcMBy+uAi6k7AZHvz4nlI WVVQ== 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=WZwD83D9KTX1uO8cXedRJd4vyXXnAoxqc7Y/V7iuhWE=; b=g/HBI9HoG2KFVczFo3sdm6akFI21MrIZogK/1k7xfoqBYRxys9oAAg7stJUFqpQ52x B6vVxFchA9vTpN1EepUiK4ZZXw34sHDV2adlaxtcAlnSp3e2u5kzJ4XKrNfbqxNHhlne 10T9z+VYi1KUUoCicOuarMz2au0ET8x0B0fNL+DADSm8Wjst3x3GdHcCAywsp18CU2ob ktLAdXTUcyJ25vnVEtQAv5qEAu6e1adcQYjxAd5x28HvCqouFPBuhsB62I72913mQx9+ 13YH0xbnQ5n2lzJ/mkwT/ROhP8qAQk0AAVhFMHlbYPBs9oCIaBVJkl3t5pvdpo3xrDVr L5xQ== X-Gm-Message-State: ANhLgQ1FoUuQb1PgGNxdVMlEDDSl3LX10En+i4fbbIYGMEdMS39eoqj7 edA6zDuiaBN7tbUEWa4cqYWx5aojlyU= X-Google-Smtp-Source: ADFU+vs35On4tbN/D2d4gao0vsJKJktgz3Sx63Pk6XnbXpDGAhEPiGJpwT0ozTUgN75ZopWVvlTbjw== X-Received: by 2002:a05:6808:56:: with SMTP id v22mr3914893oic.116.1585068463565; Tue, 24 Mar 2020 09:47:43 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Subject: [PULL for-5.0 2/5] qga-win: Handle VSS_E_PROVIDER_ALREADY_REGISTERED error Date: Tue, 24 Mar 2020 11:46:50 -0500 Message-Id: <20200324164653.19449-3-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200324164653.19449-1-mdroth@linux.vnet.ibm.com> References: <20200324164653.19449-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::234 X-Mailman-Approved-At: Tue, 24 Mar 2020 13:24:16 -0400 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: Sameeh Jubran , peter.maydell@linaro.org, Basil Salman 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: 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 Signed-off-by: Michael Roth --- 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_VERSI= ON), g_gProviderVersion); + if (hr =3D=3D (long int) VSS_E_PROVIDER_ALREADY_REGISTERED) { + DllUnregisterServer(); + hr =3D pVssAdmin->RegisterProvider(g_gProviderId, CLSID_QGAVSSProv= ider, + const_cast + (QGA_PROVIDER_LNAME), + VSS_PROV_SOFTWARE, + const_cast + (QGA_PROVIDER_VERSION), + g_gProviderVersion); + } + if (FAILED(hr)) { errmsg_dialog(hr, "RegisterProvider failed"); } --=20 2.17.1 From nobody Fri Mar 29 07:32:09 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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 ARC-Seal: i=1; a=rsa-sha256; t=1585070804; cv=none; d=zohomail.com; s=zohoarc; b=O54Rvotwrf6THBK9990kNlmVn+PTsybtVRRKyhRc44RamwcwF2+9fIcVbgDwFA01JsxyG87dJFvuYwl4xbEUj+Gu/VtaNW2KmlA3jLsaPyma+7yT+i1YMe/lHGta/mp2z7jAPivaw91BE6XDckFBvLp3Cpja9l/WYsKxjE7xt88= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585070804; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=2fuYUPCJuYkPjACVZLJEBgaE+J81FBCDK3U9qpFDHAY=; b=hKm1wLNnJ8wTuaGAXL4uF8anbvYMR7TorWxrG3hTsQQ8ClzqZULTrTWJHF/aTKIf9uqU88duGXS0fDmDLkpLO/rR3pmA2eujgfSS872s4LddPZ+ACQKdyA8rvSmVwqFHcUtLD+IwB6x2IaDg+GT3C0RWhR5iA1faYs4+Xj5/BLo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585070804241835.936369854819; Tue, 24 Mar 2020 10:26:44 -0700 (PDT) Received: from localhost ([::1]:52576 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGnK7-0004av-1N for importer@patchew.org; Tue, 24 Mar 2020 13:26:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51088) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGmiT-0003SW-A2 for qemu-devel@nongnu.org; Tue, 24 Mar 2020 12:47:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGmiS-0007vQ-5N for qemu-devel@nongnu.org; Tue, 24 Mar 2020 12:47:49 -0400 Received: from mail-ot1-x341.google.com ([2607:f8b0:4864:20::341]:34801) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jGmiS-0007v8-0W; Tue, 24 Mar 2020 12:47:48 -0400 Received: by mail-ot1-x341.google.com with SMTP id j16so17699797otl.1; Tue, 24 Mar 2020 09:47:47 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id g130sm6431258oif.13.2020.03.24.09.47.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Mar 2020 09:47:44 -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=2fuYUPCJuYkPjACVZLJEBgaE+J81FBCDK3U9qpFDHAY=; b=MvXvYcM4GKriw2qm1GQUUO1kC3qjC6t57C2XVjfHXowg97aEqFjzcnSt2sVIVVAXNv G1uZ8/n3n2CvyozwTZ432jJVXD6qof3Itf6fwIq7Lkryd/0+177X9UqJvvpkTLxKoy0e 4GW7Zj63muMzC3HbhbJui3rQwUiJUJ0D7nmh2f0XXNyid519JeN3vJ8/tFQ7PdtjZiC+ JjkqDtZew9mtGZP085ytq+GDEf5X1f54AdXvFNiwIz8nvQU9x/eftIkh/CiY6BdbkT60 MlanWUnVcm/zkBCKJ8mdU3DfqTxpKg9XN9YyeUHZzgf51TNuB/ewFaCxryA9cVZ0YjJr IOaA== 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=2fuYUPCJuYkPjACVZLJEBgaE+J81FBCDK3U9qpFDHAY=; b=iKqA8qsR0E+kRjGPZhEze1XhVPRg8LasGFRP1p86Zx1MjFdpPzLGxJvo1L1z59hE95 WvlPE9u7HVVK53yxSRLjo61OMBdyJbubUoFg/WOa1j2u6ir8hbG6KFlTKIzApSTPRksN Zn3wEHGBnKs8OSdxM7ie9HReY8ZxYmwocvdUAEazo15T489d29Z3W3kcOqC7rl1B7BQa fEkTEvS66OPUssqYaeOSu3PEXx/tS9bSiDfQyUFZumjmiWwlyk+m+6/PZwIEOxj4fvCy P7xERji1AmnGpjEe5enMZY6UMFL73/cCRrMcarUI5LfADd3NA7UGc72i1CtoK3Dherel bl7w== X-Gm-Message-State: ANhLgQ1L2IafWLZ4zXwffDgqNu9KAfQ2+swON3EUzaDeZ6xE6nVe8/9z hXVWTaZPRQgREcUkC7qkhm0ergmY2wI= X-Google-Smtp-Source: ADFU+vsUacAU8LOG47iyWyUDyEVBhA/ZdxSvlFyCl3sG7O6IK9tXjaGFAiL+ixYqDq4S5ORAwaLPTA== X-Received: by 2002:a9d:412:: with SMTP id 18mr22000135otc.134.1585068466581; Tue, 24 Mar 2020 09:47:46 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Subject: [PULL for-5.0 3/5] qga-win: prevent crash when executing guest-file-read with large count Date: Tue, 24 Mar 2020 11:46:51 -0500 Message-Id: <20200324164653.19449-4-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200324164653.19449-1-mdroth@linux.vnet.ibm.com> References: <20200324164653.19449-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::341 X-Mailman-Approved-At: Tue, 24 Mar 2020 13:24:17 -0400 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: peter.maydell@linaro.org, qemu-stable@nongnu.org, Basil Salman 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: Basil Salman guest-file-read command is currently implemented to read from a file handle count number of bytes. when executed with a very large count nu= mber 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. Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=3D1594054 Signed-off-by: Basil Salman Reported-by: Fakhri Zulkifli Cc: qemu-stable@nongnu.org Signed-off-by: Michael Roth --- 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, boo= l has_count, } =20 fh =3D gfh->fh; - buf =3D g_malloc0(count+1); + buf =3D g_try_malloc0(count + 1); + if (!buf) { + error_setg(errp, + "failed to allocate sufficient memory " + "to complete the requested service"); + return NULL; + } is_ok =3D ReadFile(fh, buf, count, &read_count, NULL); if (!is_ok) { error_setg_win32(errp, GetLastError(), "failed to read file"); --=20 2.17.1 From nobody Fri Mar 29 07:32:09 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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 ARC-Seal: i=1; a=rsa-sha256; t=1585070908; cv=none; d=zohomail.com; s=zohoarc; b=U+PVSjWQI2zFotlT946asz34fVr32wqAzLIRGuQM5LJR5rgduOgDbV06plQDuUuUVBt1MvHVd1pG/TDx4PHzrmwxf8OOwsvYV6eEJJZG9Ch5ssSPzJLcrFx6sAztcuyHB3GR/KGYOGYZVzqIj6VwBbWdGsImHW0zbZVDVbvbal4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585070908; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=i4y/hjStADTs4XYJUMM2HizGinURYTHFuzvbnc9AFAQ=; b=kBFbCbPZC/bWa6xlOdlKInaeLTHSRjN88jfiZMojl5i91OcPbQbhKuePlGj2KdJTYYyf/a1PsPtve5jJP6dduTb26MXcBtZngzD/DbaHTFA5iMZp/eeTKWHm1v+CujKj/puP0VpkVEuvhv1EXfwuOmGiEvWAGDYohON54kjVTSs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585070908646188.7877436372928; Tue, 24 Mar 2020 10:28:28 -0700 (PDT) Received: from localhost ([::1]:52600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGnLn-0006qM-Be for importer@patchew.org; Tue, 24 Mar 2020 13:28:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51107) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGmiV-0003Sj-6H for qemu-devel@nongnu.org; Tue, 24 Mar 2020 12:47:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGmiU-0007wE-7T for qemu-devel@nongnu.org; Tue, 24 Mar 2020 12:47:51 -0400 Received: from mail-ot1-x341.google.com ([2607:f8b0:4864:20::341]:32786) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jGmiU-0007vz-2U for qemu-devel@nongnu.org; Tue, 24 Mar 2020 12:47:50 -0400 Received: by mail-ot1-x341.google.com with SMTP id 22so12193604otf.0 for ; Tue, 24 Mar 2020 09:47:50 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id h3sm6152625otr.4.2020.03.24.09.47.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Mar 2020 09:47:47 -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=i4y/hjStADTs4XYJUMM2HizGinURYTHFuzvbnc9AFAQ=; b=XJUqmdcldOcsxSNkBke8bWVrJmbn3fi+FeDOzYeQJvIeHcz98XbS3R/a0L/1MFMCDi Y8OQQe4KVWX108QauVKsKswEkObYeYcrM2JgkOl+j879YUBnUC7RbBu5IVe7Pp5wRPo/ KNZ07AaiAGktO685JMO9qxuTpGap/c9j+reSiLev5a2FZnSIEhbU6mQSjIoSe7LPrjr1 IHqP9sniZJoEiuc+zawbA7UB9GD46559ZcUFDV3doF45UldS/Wpc6w8gLweAhxJA+MQS doClOfmSMwbGLGkcZ38KkFa8fD+33hs0InluDiyA5xXYzw+QRDTnST7p3vkqDfoDAwFk V6nQ== 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=i4y/hjStADTs4XYJUMM2HizGinURYTHFuzvbnc9AFAQ=; b=iw/MduJFHuIRgILBWngvyyiAvqoZzvz1TRI3m3eg3w1M3Hjni2ScBGrCyjCRDmMovh 8DB+heBlXt8/IC7wIgwepZwFXK/R/Gjq/NFRva/8EwzJE0mz2Em07MvGh1u96nmTlOE+ vi4RzdppLbt/1H0E2brhfKU9CQ7DMyaQrdIcbxDY2B1DVtm7H4HBl2f8Sotu9GHgMIAa wzLLkwh3wP6E3SVp1kjR81Yr7kk9qF6K95QfbyV/gtc9tq2nx1g4bbopU++Uw/mtLUHz A/vsVRp62CysO6KlycgTwsAfzHWYJVEldPfL5ONh6Triy1BTRjTY9XGcMZ8P9uYZRE6/ KPxQ== X-Gm-Message-State: ANhLgQ07WUNEE7Q8Cg5Fbs9o+Sw1vVDt8+jT6Eo0wXPi2GLX6FT+1VBG 0tDS/R3T9Mbg8sAgx3MZS1t5XQM9R4w= X-Google-Smtp-Source: ADFU+vufdZL/MRyTRsbOoGVRuzOO7vJb2ijvo/hqDzC+mgRSKjLTs2Vo70F14nJLmrEgxo48L/I0Ow== X-Received: by 2002:a9d:754e:: with SMTP id b14mr14718276otl.293.1585068468879; Tue, 24 Mar 2020 09:47:48 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Subject: [PULL for-5.0 4/5] qga: Fix undefined C behavior Date: Tue, 24 Mar 2020 11:46:52 -0500 Message-Id: <20200324164653.19449-5-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200324164653.19449-1-mdroth@linux.vnet.ibm.com> References: <20200324164653.19449-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::341 X-Mailman-Approved-At: Tue, 24 Mar 2020 13:24:20 -0400 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: 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: Eric Blake The QAPI struct GuestFileWhence has a comment about how we are exploiting equivalent values between two different integer types shared in a union. But C says behavior is undefined on assignments to overlapping storage when the two types are not the same width, and indeed, 'int64_t value' and 'enum QGASeek name' are very likely to be different in width. Utilize a temporary variable to fix things. Reported-by: Peter Maydell Fixes: 0b4b49387 Fixes: Coverity CID 1421990 Signed-off-by: Eric Blake Signed-off-by: Michael Roth --- qga/commands.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/qga/commands.c b/qga/commands.c index f8852beb9c..4471a9f08d 100644 --- a/qga/commands.c +++ b/qga/commands.c @@ -482,10 +482,15 @@ done: * the guest's SEEK_ constants. */ int ga_parse_whence(GuestFileWhence *whence, Error **errp) { - /* Exploit the fact that we picked values to match QGA_SEEK_*. */ + /* + * Exploit the fact that we picked values to match QGA_SEEK_*; + * however, we have to use a temporary variable since the union + * members may have different size. + */ if (whence->type =3D=3D QTYPE_QSTRING) { + int value =3D whence->u.name; whence->type =3D QTYPE_QNUM; - whence->u.value =3D whence->u.name; + whence->u.value =3D value; } switch (whence->u.value) { case QGA_SEEK_SET: --=20 2.17.1 From nobody Fri Mar 29 07:32:09 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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 ARC-Seal: i=1; a=rsa-sha256; t=1585070799; cv=none; d=zohomail.com; s=zohoarc; b=ZONXHjuFZc4ffBy0xIrYOPP9cL5mHFYpOkPuPRsrQcFpEpWrYOe7Xlr0DJ+wPqC6XqLo2b5Z8su3w/FHQ/JP2yhL1EedvllDSngGUmf2FqtMjXe5pVlMO9Wu/v9QXseLajpKOs01SmH5JTyEIRlYgr9SXmVeVbuYuYyBTm/hETA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585070799; 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=owCPdBSgizhMBzRMck0T51S2ugcJLP6z/VMj7IFHglk=; b=gpmBrKATHGNwZUyY4x/m6ra4h5Eo9i8DLHBI0diaWceuG8l5F9YZZXkbHc/lubPdgdh+u+nhqb36jG0aFbdp0yc1EkaXfWM9qDKT8pRFVIQ0i4kYAT7JipUNWiJVY3ZCEPF9MjIZcXgSJLvwaGPbGMf54jIgjvBHAkcU2qrgl3U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585070799529177.16865014995528; Tue, 24 Mar 2020 10:26:39 -0700 (PDT) Received: from localhost ([::1]:52574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGnK2-0004Vj-6H for importer@patchew.org; Tue, 24 Mar 2020 13:26:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51134) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGmiY-0003TK-1X for qemu-devel@nongnu.org; Tue, 24 Mar 2020 12:47:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGmiW-0007xo-Vl for qemu-devel@nongnu.org; Tue, 24 Mar 2020 12:47:53 -0400 Received: from mail-ot1-x331.google.com ([2607:f8b0:4864:20::331]:33531) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jGmiW-0007xT-RL for qemu-devel@nongnu.org; Tue, 24 Mar 2020 12:47:52 -0400 Received: by mail-ot1-x331.google.com with SMTP id 22so12193770otf.0 for ; Tue, 24 Mar 2020 09:47:52 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id h2sm6017455otm.44.2020.03.24.09.47.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Mar 2020 09:47:49 -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 :mime-version:content-transfer-encoding; bh=owCPdBSgizhMBzRMck0T51S2ugcJLP6z/VMj7IFHglk=; b=GYxcqrw9oB3yjZCTP16OUiPYAW3DFXcAIdvVD2TltS5TMhy8PY10i8I1ETlksRtqEV tBvmJho/EjHzMqqaccV2FuvhVHpONSyRz4roi7BdGTarJvXqUvFW0si/Qj0jSuqw9AGy ovKV0bm5pyAY34CrZocJSsI/m8Q7PmgVKBh5DwWrv5uhhTd5/zNyRcqLF6sn/6Sr6JkT GiQfUxN8OOw8dr0ESG2fzlFPLSfCcn1Edzq9LBdZFY0Yw68ytn3IdvwdBUxXe5Flqsov e5S5HuQKGvsPuwMmQ5apXWlG7fA8Cx8tRc2fmFF6x0pX3+Lc0k/8aJINmCQn/68wPQym FIRA== 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:mime-version:content-transfer-encoding; bh=owCPdBSgizhMBzRMck0T51S2ugcJLP6z/VMj7IFHglk=; b=uGAHOCBsHTC8NDiMX+COd5PJdWxW6IIkCwCthnCCF16MKY6rx1Pwgl/aeH6wbalRTD FvGUJM9ZnkjLhhWs07kg2dGrgOGFjRoWE9Jddav5ODFDNHjwBYtKjMYgGMifz5BRzdCW 9U0GqH4tgKhmVgQhZTKKSAdwBJP8KWxXiAqC39D6f4jP3peczG0vqk/rnVSobMRJSAik DYJz3hXW5lCAvz/fngkwOuzptZQDa1VSbJGW7ncR82id54psAZDBqDJBC/6+KmQ4CR41 8lGVyn5M9YcZL/e67nZGp/eP7lwmp/blu4o5bhpc9wJ/lPHf1eerjEMyvgkhQ4/2jpdb uKkg== X-Gm-Message-State: ANhLgQ3cPq2YMFSGm5jHRoCfKViZ9jjRLQhT5i7vZjh/zOMGcaAj0i8O mnuw2uQmVw+UaMxlUdGV3z+k9jO8m5g= X-Google-Smtp-Source: ADFU+vsYBTQrc1QwvboGp5iABRH2cCDbx6+tNhNsf6uAE1Hl4/x4r5IrdtE0Ca0V2xSa0HA+Rln9GA== X-Received: by 2002:a9d:63c9:: with SMTP id e9mr9687490otl.65.1585068471192; Tue, 24 Mar 2020 09:47:51 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Subject: [PULL for-5.0 5/5] qemu-ga: document vsock-listen in the man page Date: Tue, 24 Mar 2020 11:46:53 -0500 Message-Id: <20200324164653.19449-6-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200324164653.19449-1-mdroth@linux.vnet.ibm.com> References: <20200324164653.19449-1-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::331 X-Mailman-Approved-At: Tue, 24 Mar 2020 13:24:21 -0400 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: peter.maydell@linaro.org, Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Stefan Hajnoczi Although qemu-ga has supported vsock since 2016 it was not documented on the man page. Also add the socket address representation to the qga --help output. Fixes: 586ef5dee77180fc32e33bc08051600030630239 ("qga: add vsock-listen method") Signed-off-by: Stefan Hajnoczi Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Stefano Garzarella Signed-off-by: Michael Roth --- docs/interop/qemu-ga.rst | 5 +++-- qga/main.c | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/interop/qemu-ga.rst b/docs/interop/qemu-ga.rst index 1313a4ae1c..3063357bb5 100644 --- a/docs/interop/qemu-ga.rst +++ b/docs/interop/qemu-ga.rst @@ -36,13 +36,14 @@ Options .. option:: -m, --method=3DMETHOD =20 Transport method: one of ``unix-listen``, ``virtio-serial``, or - ``isa-serial`` (``virtio-serial`` is the default). + ``isa-serial``, or ``vsock-listen`` (``virtio-serial`` is the default). =20 .. option:: -p, --path=3DPATH =20 Device/socket path (the default for virtio-serial is ``/dev/virtio-ports/org.qemu.guest_agent.0``, - the default for isa-serial is ``/dev/ttyS0``) + the default for isa-serial is ``/dev/ttyS0``). Socket addresses for + vsock-listen are written as ``:``. =20 .. option:: -l, --logfile=3DPATH =20 diff --git a/qga/main.c b/qga/main.c index 8ee2736f8e..f0e454f28d 100644 --- a/qga/main.c +++ b/qga/main.c @@ -234,7 +234,9 @@ QEMU_COPYRIGHT "\n" " -p, --path device/socket path (the default for virtio-serial is:= \n" " %s,\n" " the default for isa-serial is:\n" -" %s)\n" +" %s).\n" +" Socket addresses for vsock-listen are written as\n" +" :.\n" " -l, --logfile set logfile path, logs to stderr by default\n" " -f, --pidfile specify pidfile (default is %s)\n" #ifdef CONFIG_FSFREEZE --=20 2.17.1