From e22d844ef76f4a3761ed5bf419d3cd3229f76739 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 13 Nov 2019 13:17:11 +0100 Subject: [PATCH] qemu: tpm: Sanitize error values in qemuTPMEmulatorGetPid MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The callers don't care about the actual return value, so return -1 rather than errno. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/qemu/qemu_tpm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 40136c4410..2f92542470 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -266,7 +266,7 @@ qemuTPMEmulatorCreatePidFilename(const char *swtpmStateDir, * @shortName: short name of the domain * @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 * set to -1; */ @@ -275,16 +275,16 @@ qemuTPMEmulatorGetPid(const char *swtpmStateDir, const char *shortName, pid_t *pid) { - int ret; g_autofree char *swtpm = virTPMGetSwtpm(); g_autofree char *pidfile = qemuTPMEmulatorCreatePidFilename(swtpmStateDir, shortName); if (!pidfile) - return -ENOMEM; + return -1; - ret = virPidFileReadPathIfAlive(pidfile, pid, swtpm); + if (virPidFileReadPathIfAlive(pidfile, pid, swtpm) < 0) + return -1; - return ret; + return 0; } -- 2.47.2