External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-01 20:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

testutils: Resolve Coverity issues

Browse Source 
Recent changes uncovered a NEGATIVE_RETURNS in the return from sysconf()
when processing a for loop in virtTestCaptureProgramExecChild() in
testutils.c

Code review uncovered 3 other code paths with the same condition that
weren't found by Covirity, so fixed those as well.
This commit is contained in:
John Ferlan 2013-07-11 07:22:20 -04:00
parent 0776809659
commit 8283ef9ea2
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lxc/lxc_container.c
View File

@ -247,6 +247,11 @@ static int lxcContainerSetStdio(int control, int ttyfd, int handshakefd)
/* Just in case someone forget to set FD_CLOEXEC, explicitly
* close all FDs before executing the container */
open_max = sysconf(_SC_OPEN_MAX);
if (open_max < 0) {
virReportSystemError(errno, "%s",
_("sysconf(_SC_OPEN_MAX) failed"));
goto cleanup;
}
for (fd = 0; fd < open_max; fd++)
if (fd != ttyfd && fd != control && fd != handshakefd) {
int tmpfd = fd;

5
src/util/vircommand.c
View File

@ -511,6 +511,11 @@ virExec(virCommandPtr cmd)
}
openmax = sysconf(_SC_OPEN_MAX);
if (openmax < 0) {
virReportSystemError(errno, "%s",
_("sysconf(_SC_OPEN_MAX) failed"));
goto fork_error;
}
for (fd = 3; fd < openmax; fd++) {
if (fd == childin || fd == childout || fd == childerr)
continue;

6
tests/commandhelper.c
View File

@ -58,6 +58,7 @@ static int envsort(const void *a, const void *b) {
int main(int argc, char **argv) {
size_t i, n;
int open_max;
char **origenv;
char **newenv;
char *cwd;
@ -96,7 +97,10 @@ int main(int argc, char **argv) {
fprintf(log, "ENV:%s\n", newenv[i]);
}
for (i = 0; i < sysconf(_SC_OPEN_MAX); i++) {
open_max = sysconf(_SC_OPEN_MAX);
if (open_max < 0)
return EXIT_FAILURE;
for (i = 0; i < open_max; i++) {
int f;
int closed;
if (i == fileno(log))

3
tests/testutils.c
View File

@ -281,6 +281,9 @@ void virtTestCaptureProgramExecChild(const char *const argv[],
goto cleanup;
open_max = sysconf(_SC_OPEN_MAX);
if (open_max < 0)
goto cleanup;
for (i = 0; i < open_max; i++) {
if (i != stdinfd &&
i != pipefd) {