isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only keepalive if accept() succeeded; coverity CID 207990

Browse Source
This commit is contained in:
Todd C. Miller
2020-02-07 12:54:53 -07:00
parent 2fe127d108
commit 589adfee2d
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
logsrvd/logsrvd.c
View File

@@ -1517,6 +1517,15 @@ listener_cb(int fd, int what, void *v)
sock = accept(fd, &s_un.sa, &salen); sock = accept(fd, &s_un.sa, &salen);
if (sock != -1) { if (sock != -1) {
/* set keepalive socket option on socket returned by accept */
if (logsrvd_conf_tcp_keepalive()) {
int keepalive = 1;
if (setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, &keepalive,
sizeof(keepalive)) == -1) {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO|SUDO_DEBUG_ERRNO,
"unable to set SO_KEEPALIVE option");
}
}
if (!new_connection(sock, &s_un.sa, base)) { if (!new_connection(sock, &s_un.sa, base)) {
/* TODO: pause accepting on ENOMEM */ /* TODO: pause accepting on ENOMEM */
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO, sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
@@ -1530,16 +1539,6 @@ listener_cb(int fd, int what, void *v)
/* TODO: pause accepting on ENFILE and EMFILE */ /* TODO: pause accepting on ENFILE and EMFILE */
} }
/* set keepalive socket option on socket returned by accept */
if (logsrvd_conf_tcp_keepalive()) {
int keepalive = 1;
if (setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, &keepalive,
sizeof(keepalive)) == -1) {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO|SUDO_DEBUG_ERRNO,
"unable to set SO_KEEPALIVE option");
}
}
debug_return; debug_return;
} }