Proxmox-Port/swtpm
1
0
Fork 0
mirror of https://github.com/stefanberger/swtpm.git synced 2026-08-24 07:41:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

swtpm: Have the CUSE TPM return the original TPM start error code

Browse Source 
Have the CUSE TPM return the TPM start error, particularly
TPM_DECRYPT_ERROR in case a wrong key was passed, rather than the plain
TPM_FAIL error code. This was a difference with the 'other' swtpm
interfaces that already returned the original error code.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
This commit is contained in:
Stefan Berger 2018-10-24 20:21:59 -04:00 committed by Stefan Berger
parent 3327d83878
commit 0c00eb5019
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/swtpm/cuse_tpm.c
View File

@ -399,12 +399,17 @@ static void worker_thread(gpointer data, gpointer user_data)
* libtpms and allocate a global TPM request buffer.
*
* @flags: libtpms init flags
* @l_tpmversion: the version of the TPM
* @res: the result from starting the TPM
*/
static int tpm_start(uint32_t flags, TPMLIB_TPMVersion l_tpmversion)
static int tpm_start(uint32_t flags, TPMLIB_TPMVersion l_tpmversion,
TPM_RESULT *res)
{
DIR *dir;
const char *tpmdir = tpmstate_get_dir();
*res = TPM_FAIL;
dir = opendir(tpmdir);
if (dir) {
closedir(dir);
@ -436,7 +441,8 @@ static int tpm_start(uint32_t flags, TPMLIB_TPMVersion l_tpmversion)
goto error_del_pool;
}
if (tpmlib_start(flags, l_tpmversion) != TPM_SUCCESS)
*res = tpmlib_start(flags, l_tpmversion);
if (*res != TPM_SUCCESS)
goto error_del_pool;
logprintf(STDOUT_FILENO,
@ -982,12 +988,10 @@ static void ptm_ioctl(fuse_req_t req, int cmd, void *arg,
TPMLIB_Terminate();
tpm_running = false;
if (tpm_start(init_p->u.req.init_flags, tpmversion) < 0) {
res = TPM_FAIL;
if (tpm_start(init_p->u.req.init_flags, tpmversion, &res) < 0) {
logprintf(STDERR_FILENO,
"Error: Could not initialize the TPM.\n");
} else {
res = TPM_SUCCESS;
tpm_running = true;
}
init_p->u.resp.tpm_result = res;