External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: tpm: Sanitize error values in qemuTPMEmulatorGetPid

Browse Source 
The callers don't care about the actual return value, so return -1
rather than errno.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-11-13 13:17:11 +01:00
parent c3ce83678c
commit e22d844ef7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qemu/qemu_tpm.c
View File

@ -266,7 +266,7 @@ qemuTPMEmulatorCreatePidFilename(const char *swtpmStateDir,
* @shortName: short name of the domain * @shortName: short name of the domain
* @pid: pointer to pid * @pid: pointer to pid
* *
* Return -errno upon error, or zero on successful reading of the pidfile. * Return -1 upon error, or zero on successful reading of the pidfile.
* If the PID was not still alive, zero will be returned, and @pid will be * If the PID was not still alive, zero will be returned, and @pid will be
* set to -1; * set to -1;
*/ */
@ -275,16 +275,16 @@ qemuTPMEmulatorGetPid(const char *swtpmStateDir,
const char *shortName, const char *shortName,
pid_t *pid) pid_t *pid)
{ {
int ret;
g_autofree char *swtpm = virTPMGetSwtpm(); g_autofree char *swtpm = virTPMGetSwtpm();
g_autofree char *pidfile = qemuTPMEmulatorCreatePidFilename(swtpmStateDir, g_autofree char *pidfile = qemuTPMEmulatorCreatePidFilename(swtpmStateDir,
shortName); shortName);
if (!pidfile) if (!pidfile)
return -ENOMEM; return -1;
ret = virPidFileReadPathIfAlive(pidfile, pid, swtpm); if (virPidFileReadPathIfAlive(pidfile, pid, swtpm) < 0)
return -1;
return ret; return 0;
} }