Hesham/wintun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

api: adapter: cleanup wintrust shim if install fails

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2021-09-28 10:39:47 -06:00
parent 47c8eda1d5
commit 98cf23c410
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/adapter.c
View File

@ -1195,7 +1195,7 @@ SelectDriver(
if (!SetupCopyOEMInfW(InfPath, NULL, SPOST_NONE, 0, InfStorePath, MAX_PATH, NULL, NULL)) if (!SetupCopyOEMInfW(InfPath, NULL, SPOST_NONE, 0, InfStorePath, MAX_PATH, NULL, NULL))
{ {
LastError = LOG_LAST_ERROR(L"Could not install driver %s to store", InfPath); LastError = LOG_LAST_ERROR(L"Could not install driver %s to store", InfPath);
goto cleanupDelete; goto cleanupWintrustChangedKey;
} }
_Analysis_assume_nullterminated_(InfStorePath); _Analysis_assume_nullterminated_(InfStorePath);
@ -1207,29 +1207,29 @@ SelectDriver(
{ {
LOG(WINTUN_LOG_ERR, L"Inf path too long: %s", InfStorePath); LOG(WINTUN_LOG_ERR, L"Inf path too long: %s", InfStorePath);
LastError = ERROR_INVALID_PARAMETER; LastError = ERROR_INVALID_PARAMETER;
goto cleanupDelete; goto cleanupWintrustChangedKey;
} }
if (!SetupDiSetDeviceInstallParamsW(DevInfo, DevInfoData, DevInstallParams)) if (!SetupDiSetDeviceInstallParamsW(DevInfo, DevInfoData, DevInstallParams))
{ {
LastError = LOG_LAST_ERROR(L"Failed to set adapter %u device installation parameters", DevInfoData->DevInst); LastError = LOG_LAST_ERROR(L"Failed to set adapter %u device installation parameters", DevInfoData->DevInst);
goto cleanupDelete; goto cleanupWintrustChangedKey;
} }
if (!SetupDiBuildDriverInfoList(DevInfo, DevInfoData, SPDIT_COMPATDRIVER)) if (!SetupDiBuildDriverInfoList(DevInfo, DevInfoData, SPDIT_COMPATDRIVER))
{ {
LastError = LOG_LAST_ERROR(L"Failed rebuilding adapter %u driver info list", DevInfoData->DevInst); LastError = LOG_LAST_ERROR(L"Failed rebuilding adapter %u driver info list", DevInfoData->DevInst);
goto cleanupDelete; goto cleanupWintrustChangedKey;
} }
DestroyDriverInfoListOnCleanup = TRUE; DestroyDriverInfoListOnCleanup = TRUE;
SP_DRVINFO_DATA_W DrvInfoData = { .cbSize = sizeof(SP_DRVINFO_DATA_W) }; SP_DRVINFO_DATA_W DrvInfoData = { .cbSize = sizeof(SP_DRVINFO_DATA_W) };
if (!SetupDiEnumDriverInfoW(DevInfo, DevInfoData, SPDIT_COMPATDRIVER, 0, &DrvInfoData)) if (!SetupDiEnumDriverInfoW(DevInfo, DevInfoData, SPDIT_COMPATDRIVER, 0, &DrvInfoData))
{ {
LastError = LOG_LAST_ERROR(L"Failed to get adapter %u driver", DevInfoData->DevInst); LastError = LOG_LAST_ERROR(L"Failed to get adapter %u driver", DevInfoData->DevInst);
goto cleanupDelete; goto cleanupWintrustChangedKey;
} }
if (!SetupDiSetSelectedDriverW(DevInfo, DevInfoData, &DrvInfoData)) if (!SetupDiSetSelectedDriverW(DevInfo, DevInfoData, &DrvInfoData))
{ {
LastError = LOG_LAST_ERROR(L"Failed to set adapter %u driver", DevInfoData->DevInst); LastError = LOG_LAST_ERROR(L"Failed to set adapter %u driver", DevInfoData->DevInst);
goto cleanupDelete; goto cleanupWintrustChangedKey;
} }
LastError = ERROR_SUCCESS; LastError = ERROR_SUCCESS;
DestroyDriverInfoListOnCleanup = FALSE; DestroyDriverInfoListOnCleanup = FALSE;