mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-02 10:19:52 +00:00
lib, ldpd: fix "argument cannot be negative" coverity warnings
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
parent
76ae8092db
commit
993bab898d
13
ldpd/ldpd.c
13
ldpd/ldpd.c
@ -450,10 +450,15 @@ start_child(enum ldpd_process p, char *argv0, int fd_async, int fd_sync)
|
||||
}
|
||||
|
||||
nullfd = open("/dev/null", O_RDONLY | O_NOCTTY);
|
||||
dup2(nullfd, 0);
|
||||
dup2(nullfd, 1);
|
||||
dup2(nullfd, 2);
|
||||
close(nullfd);
|
||||
if (nullfd == -1) {
|
||||
zlog_err("%s: failed to open /dev/null: %s", __func__,
|
||||
safe_strerror(errno));
|
||||
} else {
|
||||
dup2(nullfd, 0);
|
||||
dup2(nullfd, 1);
|
||||
dup2(nullfd, 2);
|
||||
close(nullfd);
|
||||
}
|
||||
|
||||
if (dup2(fd_async, LDPD_FD_ASYNC) == -1)
|
||||
fatal("cannot setup imsg async fd");
|
||||
|
30
lib/libfrr.c
30
lib/libfrr.c
@ -768,6 +768,8 @@ void frr_vty_serv(void)
|
||||
|
||||
static void frr_terminal_close(int isexit)
|
||||
{
|
||||
int nullfd;
|
||||
|
||||
if (daemon_ctl_sock != -1) {
|
||||
close(daemon_ctl_sock);
|
||||
daemon_ctl_sock = -1;
|
||||
@ -783,11 +785,16 @@ static void frr_terminal_close(int isexit)
|
||||
fflush(stdout);
|
||||
}
|
||||
|
||||
int nullfd = open("/dev/null", O_RDONLY | O_NOCTTY);
|
||||
dup2(nullfd, 0);
|
||||
dup2(nullfd, 1);
|
||||
dup2(nullfd, 2);
|
||||
close(nullfd);
|
||||
nullfd = open("/dev/null", O_RDONLY | O_NOCTTY);
|
||||
if (nullfd == -1) {
|
||||
zlog_err("%s: failed to open /dev/null: %s", __func__,
|
||||
safe_strerror(errno));
|
||||
} else {
|
||||
dup2(nullfd, 0);
|
||||
dup2(nullfd, 1);
|
||||
dup2(nullfd, 2);
|
||||
close(nullfd);
|
||||
}
|
||||
}
|
||||
|
||||
static struct thread *daemon_ctl_thread = NULL;
|
||||
@ -849,10 +856,15 @@ void frr_run(struct thread_master *master)
|
||||
}
|
||||
} else if (di->daemon_mode) {
|
||||
int nullfd = open("/dev/null", O_RDONLY | O_NOCTTY);
|
||||
dup2(nullfd, 0);
|
||||
dup2(nullfd, 1);
|
||||
dup2(nullfd, 2);
|
||||
close(nullfd);
|
||||
if (nullfd == -1) {
|
||||
zlog_err("%s: failed to open /dev/null: %s", __func__,
|
||||
safe_strerror(errno));
|
||||
} else {
|
||||
dup2(nullfd, 0);
|
||||
dup2(nullfd, 1);
|
||||
dup2(nullfd, 2);
|
||||
close(nullfd);
|
||||
}
|
||||
|
||||
if (daemon_ctl_sock != -1)
|
||||
close(daemon_ctl_sock);
|
||||
|
Loading…
Reference in New Issue
Block a user