提交 b13e4591 编写于 作者: P Peter Krempa

util: pidfile: Sanitize return values of virPidFileReadIfAlive

Return -1 on failure rather than -errno since none of the callers
actually cares about the return value. This specifically fixes returns
of -ENOMEM in cases of bad usage, which would report wrong error
anyways.
Signed-off-by: NPeter Krempa <pkrempa@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
上级 19cfd7e5
...@@ -282,7 +282,7 @@ int virPidFileReadPathIfAlive(const char *path, ...@@ -282,7 +282,7 @@ int virPidFileReadPathIfAlive(const char *path,
* and its executable path resolves to @binpath. This adds * and its executable path resolves to @binpath. This adds
* protection against recycling of previously reaped pids. * protection against recycling of previously reaped pids.
* *
* Returns -errno upon error, or zero on successful * Returns -1 upon error, or zero on successful
* reading of the pidfile. If the PID was not still * reading of the pidfile. If the PID was not still
* alive, zero will be returned, but @pid will be * alive, zero will be returned, but @pid will be
* set to -1. * set to -1.
...@@ -295,12 +295,15 @@ int virPidFileReadIfAlive(const char *dir, ...@@ -295,12 +295,15 @@ int virPidFileReadIfAlive(const char *dir,
g_autofree char *pidfile = NULL; g_autofree char *pidfile = NULL;
if (name == NULL || dir == NULL) if (name == NULL || dir == NULL)
return -EINVAL; return -1;
if (!(pidfile = virPidFileBuildPath(dir, name))) if (!(pidfile = virPidFileBuildPath(dir, name)))
return -ENOMEM; return -1;
if (virPidFileReadPathIfAlive(pidfile, pid, binpath) < 0)
return -1;
return virPidFileReadPathIfAlive(pidfile, pid, binpath); return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册