From 98cf23c410d851cea340023e235855203fc535f2 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 28 Sep 2021 10:39:47 -0600 Subject: api: adapter: cleanup wintrust shim if install fails Signed-off-by: Jason A. Donenfeld --- api/adapter.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/api/adapter.c b/api/adapter.c index 8fa1ff6..f0a90e5 100644 --- a/api/adapter.c +++ b/api/adapter.c @@ -1195,7 +1195,7 @@ SelectDriver( 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); - goto cleanupDelete; + goto cleanupWintrustChangedKey; } _Analysis_assume_nullterminated_(InfStorePath); @@ -1207,29 +1207,29 @@ SelectDriver( { LOG(WINTUN_LOG_ERR, L"Inf path too long: %s", InfStorePath); LastError = ERROR_INVALID_PARAMETER; - goto cleanupDelete; + goto cleanupWintrustChangedKey; } if (!SetupDiSetDeviceInstallParamsW(DevInfo, DevInfoData, DevInstallParams)) { 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)) { LastError = LOG_LAST_ERROR(L"Failed rebuilding adapter %u driver info list", DevInfoData->DevInst); - goto cleanupDelete; + goto cleanupWintrustChangedKey; } DestroyDriverInfoListOnCleanup = TRUE; SP_DRVINFO_DATA_W DrvInfoData = { .cbSize = sizeof(SP_DRVINFO_DATA_W) }; if (!SetupDiEnumDriverInfoW(DevInfo, DevInfoData, SPDIT_COMPATDRIVER, 0, &DrvInfoData)) { LastError = LOG_LAST_ERROR(L"Failed to get adapter %u driver", DevInfoData->DevInst); - goto cleanupDelete; + goto cleanupWintrustChangedKey; } if (!SetupDiSetSelectedDriverW(DevInfo, DevInfoData, &DrvInfoData)) { LastError = LOG_LAST_ERROR(L"Failed to set adapter %u driver", DevInfoData->DevInst); - goto cleanupDelete; + goto cleanupWintrustChangedKey; } LastError = ERROR_SUCCESS; DestroyDriverInfoListOnCleanup = FALSE; -- cgit v1.2.3-59-g8ed1b