From: John Ferlan Date: Thu, 11 Sep 2014 20:58:40 +0000 (-0400) Subject: daemon: Resolve Coverity RESOURCE_LEAK X-Git-Tag: CVE-2014-3633~73 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c77ac79d6b5a6758f3a980d2edfd0abda9aa7d3e;p=thirdparty%2Flibvirt.git daemon: Resolve Coverity RESOURCE_LEAK With eblake's help - adjust the checks for stdinfd/stdoutfd to ensure the values are within the range we expect; otherwise the dup2()'s and subsequent VIR_CLOSE() calls cause Coverity to believe there's a resource leak. Signed-off-by: John Ferlan --- diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 0503cd025d..05ee50e08c 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -163,9 +163,9 @@ static int daemonForkIntoBackground(const char *argv0) VIR_FORCE_CLOSE(statuspipe[0]); - if ((stdinfd = open("/dev/null", O_RDONLY)) < 0) + if ((stdinfd = open("/dev/null", O_RDONLY)) <= STDERR_FILENO) goto cleanup; - if ((stdoutfd = open("/dev/null", O_WRONLY)) < 0) + if ((stdoutfd = open("/dev/null", O_WRONLY)) <= STDERR_FILENO) goto cleanup; if (dup2(stdinfd, STDIN_FILENO) != STDIN_FILENO) goto cleanup; @@ -173,9 +173,9 @@ static int daemonForkIntoBackground(const char *argv0) goto cleanup; if (dup2(stdoutfd, STDERR_FILENO) != STDERR_FILENO) goto cleanup; - if (stdinfd > STDERR_FILENO && VIR_CLOSE(stdinfd) < 0) + if (VIR_CLOSE(stdinfd) < 0) goto cleanup; - if (stdoutfd > STDERR_FILENO && VIR_CLOSE(stdoutfd) < 0) + if (VIR_CLOSE(stdoutfd) < 0) goto cleanup; if (setsid() < 0)