From nobody Tue May 14 09:33:39 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=1676914960; cv=none; d=zohomail.com; s=zohoarc; b=lu/BtwdujbGTg+EoEB7n3b0PCfufxuW4cJWEpHw27hmjWWoe6ZqF5CDThCRXjjh/ovkrNfSBPZawaqLGNxTzl0St3ww+EWgdVl7xUkQJjwrhC3HpHGa1oRVZxRn698jPXSFL5l7U1eWF6zAQ3ttSW303QbNus6CLqkWmOOfTNZg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676914960; h=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=20p3Iz7i0wQVJa2DL+NmPcUIyh4AXjW0qiDy733YOkY=; b=kio3rTsZIX2Tm+7yDYw/funulbPJGLRodUklphxEBSgyWRb8AiYKwjKVmuorEIU1WTyVlY2B/m1hgavdx+OKwtjMQbY3O06PEQTAK8Ynb/nmSEKFzA6jFbg+Ehg7PaNmFEt4IoXKpADI0nXRNs1m+gnGbMOODWXcSxoiMcnXBm0= 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 1676914960831156.49627653937011; Mon, 20 Feb 2023 09:42:40 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pUAAn-00023y-O8; Mon, 20 Feb 2023 12:41:57 -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 1pUAAk-00022k-F8 for qemu-devel@nongnu.org; Mon, 20 Feb 2023 12:41:55 -0500 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 1pUAAi-0001Vc-8T for qemu-devel@nongnu.org; Mon, 20 Feb 2023 12:41:54 -0500 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-377-X131YZNfOO-2U1STkoj09Q-1; Mon, 20 Feb 2023 12:41:48 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D857329DD985; Mon, 20 Feb 2023 17:41:47 +0000 (UTC) Received: from kostyanf14nb.Dlink (unknown [10.45.224.49]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 66E36404CD84; Mon, 20 Feb 2023 17:41:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676914911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=20p3Iz7i0wQVJa2DL+NmPcUIyh4AXjW0qiDy733YOkY=; b=YMxLH6co8QNEvvdinPnKXcKAcyKzbsZDe+Q76P2rHMKdX1JbR1nKwYQCeciJm7MURmNUmg hd4246qFGMqUW9Z8vvk+g0lPxAds88llZoVLePpzClW5DeNoTEBCxOJU+dboYQScUz2yh9 vvfsLrqoI++FHoFXIPzTyuBQcbu9fZQ= X-MC-Unique: X131YZNfOO-2U1STkoj09Q-1 From: Konstantin Kostiuk To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Michael Roth , Mauro Matteo Cascella , Yan Vugenfirer Subject: [PATCH 1/2] qga/win32: Remove change action from MSI installer Date: Mon, 20 Feb 2023 19:41:41 +0200 Message-Id: <20230220174142.240393-2-kkostiuk@redhat.com> In-Reply-To: <20230220174142.240393-1-kkostiuk@redhat.com> References: <20230220174142.240393-1-kkostiuk@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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=kkostiuk@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: 1676914962503100001 Content-Type: text/plain; charset="utf-8" resolves: rhbz#2167436 fixes: CVE-2023-0664 Signed-off-by: Konstantin Kostiuk Reported-by: Brian Wiltse Reviewed-by: Yan Vugenfirer --- qga/installer/qemu-ga.wxs | 1 + 1 file changed, 1 insertion(+) diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs index 51340f7ecc..feb629ec47 100644 --- a/qga/installer/qemu-ga.wxs +++ b/qga/installer/qemu-ga.wxs @@ -31,6 +31,7 @@ /> 1 + -- 2.25.1 From nobody Tue May 14 09:33:39 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=1676914970; cv=none; d=zohomail.com; s=zohoarc; b=aPBzd01PUdJEs2WEB/q1ZgeRGcNsdVfP7aQdmPzJ6OMQeYR95GIpdfS/tEcuNuIkBVjwo2coBzX+Gi6zPvDOufYNf3hrKZsfRBz1AkR41gme1Vy2G9o9PpuWkwW9um6+lp0TuVmBG49NsAFB6PNvuRvqUXq1zbEJL4/KtsnUe84= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676914970; h=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=7KiL9+KFCXh/oTcHXI2rSh6PoRnGKK4D8XMQnveaPqI=; b=kDkrd8DKzbIM/QXm81SxFlkyr4XUN9EHfW8i7TLhESJ8PcZe4NHeijLfc3pjbyjZXyzAcA7+hCkuv8py9xO+6kXjR5XPjuTdStYA9egiIlMNaZQPMhz+R/OS5dAwQKqdqMqojiItEkvyLl2ALifIuPs5WCNW0dL3GgjZxjtdW4Q= 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 1676914970264431.34238419632425; Mon, 20 Feb 2023 09:42:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pUAAm-00022s-85; Mon, 20 Feb 2023 12:41:56 -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 1pUAAj-00022Q-Ff for qemu-devel@nongnu.org; Mon, 20 Feb 2023 12:41:53 -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 1pUAAh-0001VZ-SK for qemu-devel@nongnu.org; Mon, 20 Feb 2023 12:41:53 -0500 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-248-gvm5jXHsMKaBsHriLCMrjQ-1; Mon, 20 Feb 2023 12:41:49 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6A1441C17421; Mon, 20 Feb 2023 17:41:49 +0000 (UTC) Received: from kostyanf14nb.Dlink (unknown [10.45.224.49]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4469F404CD84; Mon, 20 Feb 2023 17:41:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676914911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7KiL9+KFCXh/oTcHXI2rSh6PoRnGKK4D8XMQnveaPqI=; b=QoDgx8wU/spj6qHgA5lLSGhf1NodVKMNsGr8OA5hvnSc4DOsF476CmuwWoaMLb1nxOwCIo R2V91bNrgEutINOZggYDx/wU1dGvodfUreFTz2ZgFsz4d4cy6G0b3tiERYBEByHAevjYfm 14bc4f6vUfCWEqf/q3mlBAmsmctMeXU= X-MC-Unique: gvm5jXHsMKaBsHriLCMrjQ-1 From: Konstantin Kostiuk To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Michael Roth , Mauro Matteo Cascella , Yan Vugenfirer Subject: [PATCH 2/2] qga/win32: Use rundll for VSS installation Date: Mon, 20 Feb 2023 19:41:42 +0200 Message-Id: <20230220174142.240393-3-kkostiuk@redhat.com> In-Reply-To: <20230220174142.240393-1-kkostiuk@redhat.com> References: <20230220174142.240393-1-kkostiuk@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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=kkostiuk@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: 1676914970566100001 Content-Type: text/plain; charset="utf-8" Add specific an entry points for rundll which is just a wrapper for COMRegister/COMUnregister functions. resolves: rhbz#2167436 fixes: CVE-2023-0664 Signed-off-by: Konstantin Kostiuk Reviewed-by: Yan Vugenfirer --- qga/installer/qemu-ga.wxs | 10 +++++----- qga/vss-win32/install.cpp | 9 +++++++++ qga/vss-win32/qga-vss.def | 2 ++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs index feb629ec47..46ae9e7a13 100644 --- a/qga/installer/qemu-ga.wxs +++ b/qga/installer/qemu-ga.wxs @@ -127,22 +127,22 @@ =20 - + =20 diff --git a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp index b57508fbe0..68662a6dfc 100644 --- a/qga/vss-win32/install.cpp +++ b/qga/vss-win32/install.cpp @@ -357,6 +357,15 @@ out: return hr; } =20 +STDAPI_(void) CALLBACK DLLCOMRegister(HWND, HINSTANCE, LPSTR, int) +{ + COMRegister(); +} + +STDAPI_(void) CALLBACK DLLCOMUnregister(HWND, HINSTANCE, LPSTR, int) +{ + COMUnregister(); +} =20 static BOOL CreateRegistryKey(LPCTSTR key, LPCTSTR value, LPCTSTR data) { diff --git a/qga/vss-win32/qga-vss.def b/qga/vss-win32/qga-vss.def index 927782c31b..ee97a81427 100644 --- a/qga/vss-win32/qga-vss.def +++ b/qga/vss-win32/qga-vss.def @@ -1,6 +1,8 @@ LIBRARY "QGA-PROVIDER.DLL" =20 EXPORTS + DLLCOMRegister + DLLCOMUnregister COMRegister PRIVATE COMUnregister PRIVATE DllCanUnloadNow PRIVATE --=20 2.25.1