External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-03 12:55:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

tpm: Check whether previously found executables were updated

Browse Source 
Check whether previously found executables were updated and if
so look for them again. This helps to use updated features of
swtpm and its tools upon updating them.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Stefan Berger 2019-07-25 14:22:04 -04:00 committed by Daniel P. Berrangé
parent 2fcbe9f97d
commit 01cf7a1bb9
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qemu/qemu_tpm.c
View File

@ -20,6 +20,7 @@
#include <config.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include <fcntl.h>

31
src/util/virtpm.c
View File

@ -78,8 +78,13 @@ virTPMCreateCancelPath(const char *devpath)
*/
static virMutex swtpm_tools_lock = VIR_MUTEX_INITIALIZER;
static char *swtpm_path;
static struct stat swtpm_stat;
static char *swtpm_setup;
static struct stat swtpm_setup_stat;
static char *swtpm_ioctl;
static struct stat swtpm_ioctl_stat;
char *
virTPMGetSwtpm(void)
@ -139,18 +144,22 @@ virTPMEmulatorInit(void)
static const struct {
const char *name;
char **path;
struct stat *stat;
} prgs[] = {
{
.name = "swtpm",
.path = &swtpm_path,
.stat = &swtpm_stat,
},
{
.name = "swtpm_setup",
.path = &swtpm_setup,
.stat = &swtpm_setup_stat,
},
{
.name = "swtpm_ioctl",
.path = &swtpm_ioctl,
.stat = &swtpm_ioctl_stat,
}
};
size_t i;
@ -160,8 +169,24 @@ virTPMEmulatorInit(void)
for (i = 0; i < ARRAY_CARDINALITY(prgs); i++) {
VIR_AUTOFREE(char *) path = NULL;
bool findit = *prgs[i].path == NULL;
struct stat statbuf;
char *tmp;
if (!findit) {
/* has executables changed? */
if (stat(*prgs[i].path, &statbuf) < 0)
findit = true;
if (!findit &&
&statbuf.st_mtime != &prgs[i].stat->st_mtime)
findit = true;
}
if (findit) {
tmp = *prgs[i].path;
VIR_FREE(tmp);
*prgs[i].path = NULL;
path = virFindFileInPath(prgs[i].name);
if (!path) {
virReportSystemError(ENOENT,
@ -175,7 +200,13 @@ virTPMEmulatorInit(void)
path);
goto cleanup;
}
if (stat(path, prgs[i].stat) < 0) {
virReportSystemError(errno,
_("Could not stat %s"), path);
goto cleanup;
}
*prgs[i].path = path;
path = NULL;
}
}