mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qga/win32: Use rundll for VSS installation

Browse Source 
The custom action uses cmd.exe to run VSS Service installation
and removal which causes an interactive command shell to spawn.
This shell can be used to execute any commands as a SYSTEM user.
Even if call qemu-ga.exe directly the interactive command shell
will be spawned as qemu-ga.exe is a console application and used
by users from the console as well as a service.

As VSS Service runs from DLL which contains the installer and
uninstaller code, it can be run directly by rundll32.exe without
any interactive command shell.

Add specific entry points for rundll which is just a wrapper
for COMRegister/COMUnregister functions with proper arguments.

resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2167423
fixes: CVE-2023-0664 (part 2 of 2)

Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Reviewed-by: Yan Vugenfirer <yvugenfi@redhat.com>
Reported-by: Brian Wiltse <brian.wiltse@live.com>
(cherry picked from commit 07ce178a2b)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Konstantin Kostiuk 2023-03-03 21:20:08 +02:00 committed by Michael Tokarev
parent daa3277175
commit b629412e9d
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qga/installer/qemu-ga.wxs
View File

@ -116,22 +116,22 @@
</Directory> </Directory>
</Directory> </Directory>
<Property Id="cmd" Value="cmd.exe"/> <Property Id="rundll" Value="rundll32.exe"/>
<Property Id="REINSTALLMODE" Value="amus"/> <Property Id="REINSTALLMODE" Value="amus"/>
<?ifdef var.InstallVss?> <?ifdef var.InstallVss?>
<CustomAction Id="RegisterCom" <CustomAction Id="RegisterCom"
ExeCommand='/c "[qemu_ga_directory]qemu-ga.exe" -s vss-install' ExeCommand='"[qemu_ga_directory]qga-vss.dll",DLLCOMRegister'
Execute="deferred" Execute="deferred"
Property="cmd" Property="rundll"
Impersonate="no" Impersonate="no"
Return="check" Return="check"
> >
</CustomAction> </CustomAction>
<CustomAction Id="UnRegisterCom" <CustomAction Id="UnRegisterCom"
ExeCommand='/c "[qemu_ga_directory]qemu-ga.exe" -s vss-uninstall' ExeCommand='"[qemu_ga_directory]qga-vss.dll",DLLCOMUnregister'
Execute="deferred" Execute="deferred"
Property="cmd" Property="rundll"
Impersonate="no" Impersonate="no"
Return="check" Return="check"
> >

9
qga/vss-win32/install.cpp
View File

@ -357,6 +357,15 @@ out:
return hr; return hr;
} }
STDAPI_(void) CALLBACK DLLCOMRegister(HWND, HINSTANCE, LPSTR, int)
{
COMRegister();
}
STDAPI_(void) CALLBACK DLLCOMUnregister(HWND, HINSTANCE, LPSTR, int)
{
COMUnregister();
}
static BOOL CreateRegistryKey(LPCTSTR key, LPCTSTR value, LPCTSTR data) static BOOL CreateRegistryKey(LPCTSTR key, LPCTSTR value, LPCTSTR data)
{ {

2
qga/vss-win32/qga-vss.def
View File

@ -1,6 +1,8 @@
LIBRARY "QGA-PROVIDER.DLL" LIBRARY "QGA-PROVIDER.DLL"
EXPORTS EXPORTS
DLLCOMRegister
DLLCOMUnregister
COMRegister PRIVATE COMRegister PRIVATE
COMUnregister PRIVATE COMUnregister PRIVATE
DllCanUnloadNow PRIVATE DllCanUnloadNow PRIVATE