External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: ensure all TPM global vars access is protected by lock

Browse Source 
The virTPMEmulatorInit method updates various global variables
and holds a lock while doing so. Other methods which access
these variables, however, don't reliably hold locks over all
of their accesses.

Since virTPMEmulatorInit is no longer exported, we can push
the locking up into all the callers and achieve proper safety
for concurrent usage.

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-11-24 10:30:25 +00:00
parent c032786e08
commit 63c42ba1d1
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/util/virtpm.c
View File

@ -137,15 +137,17 @@ static int virTPMEmulatorInit(void);
static char *
virTPMBinaryGetPath(virTPMBinary binary)
{
char *s;
if (!swtpmBinaries[binary].path && virTPMEmulatorInit() < 0)
return NULL;
char *s = NULL;
virMutexLock(&swtpm_tools_lock);
s = g_strdup(swtpmBinaries[binary].path);
virMutexUnlock(&swtpm_tools_lock);
if (virTPMEmulatorInit() < 0)
goto cleanup;
s = g_strdup(swtpmBinaries[binary].path);
cleanup:
virMutexUnlock(&swtpm_tools_lock);
return s;
}
@ -269,11 +271,8 @@ virTPMGetCaps(virTPMBinaryCapsParse capsParse,
static int
virTPMEmulatorInit(void)
{
int ret = -1;
size_t i;
virMutexLock(&swtpm_tools_lock);
for (i = 0; i < VIR_TPM_BINARY_LAST; i++) {
g_autofree char *path = NULL;
bool findit = swtpmBinaries[i].path == NULL;
@ -297,18 +296,18 @@ virTPMEmulatorInit(void)
virReportSystemError(ENOENT,
_("Unable to find '%s' binary in $PATH"),
virTPMBinaryTypeToString(i));
goto cleanup;
return -1;
}
if (!virFileIsExecutable(path)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("%s is not an executable"),
path);
goto cleanup;
return -1;
}
if (stat(path, &swtpmBinaries[i].stat) < 0) {
virReportSystemError(errno,
_("Could not stat %s"), path);
goto cleanup;
return -1;
}
swtpmBinaries[i].path = g_steal_pointer(&path);
@ -317,26 +316,29 @@ virTPMEmulatorInit(void)
swtpmBinaries[i].path,
swtpmBinaries[i].parm);
if (!swtpmBinaries[i].caps)
goto cleanup;
return -1;
}
}
}
ret = 0;
cleanup:
virMutexUnlock(&swtpm_tools_lock);
return ret;
return 0;
}
static bool
virTPMBinaryGetCaps(virTPMBinary binary,
unsigned int cap)
{
bool ret = false;
virMutexLock(&swtpm_tools_lock);
if (virTPMEmulatorInit() < 0)
return false;
return virBitmapIsBitSet(swtpmBinaries[binary].caps, cap);
goto cleanup;
ret = virBitmapIsBitSet(swtpmBinaries[binary].caps, cap);
cleanup:
virMutexUnlock(&swtpm_tools_lock);
return ret;
}
bool