GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 08:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

clear all fds and mem prior to exec

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2013-02-04 20:56:35 +01:00
parent c8c90ffeda
commit f5507a7161
3 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main-script.c
View File

@@ -74,6 +74,10 @@ int ret;
if (getnameinfo((void*)&proc->lease->rip6, proc->lease->rip6_len, remote, sizeof(remote), NULL, 0, NI_NUMERICHOST) != 0) if (getnameinfo((void*)&proc->lease->rip6, proc->lease->rip6_len, remote, sizeof(remote), NULL, 0, NI_NUMERICHOST) != 0)
exit(1); exit(1);
} }
/* FIXME: using close on exec should be more efficient
* than that */
clear_lists(s);
ret = execlp(s->config->disconnect_script, s->config->disconnect_script, ret = execlp(s->config->disconnect_script, s->config->disconnect_script,
proc->username, proc->lease->name, real, local, remote, NULL); proc->username, proc->lease->name, real, local, remote, NULL);
@@ -120,6 +124,8 @@ int ret, status;
exit(1); exit(1);
} }
clear_lists(s);
ret = execlp(s->config->connect_script, s->config->connect_script, ret = execlp(s->config->connect_script, s->config->connect_script,
proc->username, proc->lease->name, real, local, remote, NULL); proc->username, proc->lease->name, real, local, remote, NULL);
if (ret == -1) if (ret == -1)

28
src/main.c
View File

@@ -47,11 +47,6 @@ static unsigned int terminate = 0;
static unsigned int need_maintainance = 0; static unsigned int need_maintainance = 0;
static unsigned int need_children_cleanup = 0; static unsigned int need_children_cleanup = 0;
struct listen_list_st {
struct list_head list;
int fd;
};
static void tls_log_func(int level, const char *str) static void tls_log_func(int level, const char *str)
{ {
syslog(LOG_DEBUG, "Debug[<%d>]: %s", level, str); syslog(LOG_DEBUG, "Debug[<%d>]: %s", level, str);
@@ -285,26 +280,21 @@ static void drop_privileges(struct cfg_st *config)
} }
} }
static void clear_listen_list(struct listen_list_st* llist) /* clears the server llist and clist. To be used after fork() */
void clear_lists(main_server_st *s)
{ {
struct list_head *cq; struct list_head *cq;
struct list_head *pos; struct list_head *pos;
struct listen_list_st *ltmp; struct listen_list_st *ltmp;
struct proc_list_st *ctmp;
list_for_each_safe(pos, cq, &llist->list) { list_for_each_safe(pos, cq, &s->llist->list) {
ltmp = list_entry(pos, struct listen_list_st, list); ltmp = list_entry(pos, struct listen_list_st, list);
close(ltmp->fd); close(ltmp->fd);
list_del(&ltmp->list); list_del(&ltmp->list);
} }
}
static void clear_proc_list(struct proc_list_st* clist) list_for_each_safe(pos, cq, &s->clist->list) {
{
struct list_head *cq;
struct list_head *pos;
struct proc_list_st *ctmp;
list_for_each_safe(pos, cq, &clist->list) {
ctmp = list_entry(pos, struct proc_list_st, list); ctmp = list_entry(pos, struct proc_list_st, list);
if (ctmp->fd >= 0) if (ctmp->fd >= 0)
close(ctmp->fd); close(ctmp->fd);
@@ -390,6 +380,8 @@ int main(int argc, char** argv)
s.config = &config; s.config = &config;
s.tun = &tun; s.tun = &tun;
s.tls_db = tls_db; s.tls_db = tls_db;
s.llist = &llist;
s.clist = &clist;
/* Listen to network ports */ /* Listen to network ports */
ret = listen_ports(&config, &llist, config.name, config.port, SOCK_STREAM); ret = listen_ports(&config, &llist, config.name, config.port, SOCK_STREAM);
@@ -542,8 +534,7 @@ int main(int argc, char** argv)
* running the server * running the server
*/ */
close(cmd_fd[0]); close(cmd_fd[0]);
clear_listen_list(&llist); clear_lists(&s);
clear_proc_list(&clist);
ws.config = &config; ws.config = &config;
ws.cmd_fd = cmd_fd[1]; ws.cmd_fd = cmd_fd[1];
@@ -599,8 +590,7 @@ fork_failed:
pid = fork(); pid = fork();
if (pid == 0) { /* child */ if (pid == 0) { /* child */
syslog(LOG_INFO, "Performing maintainance"); syslog(LOG_INFO, "Performing maintainance");
clear_listen_list(&llist); clear_lists(&s);
clear_proc_list(&clist);
expire_cookies(&config); expire_cookies(&config);
expire_tls_sessions(&s); expire_tls_sessions(&s);

10
src/main.h
View File

@@ -11,6 +11,11 @@
int cmd_parser (int argc, char **argv, struct cfg_st* config); int cmd_parser (int argc, char **argv, struct cfg_st* config);
struct listen_list_st {
struct list_head list;
int fd;
};
struct proc_list_st { struct proc_list_st {
struct list_head list; struct list_head list;
int fd; int fd;
@@ -29,8 +34,13 @@ typedef struct main_server_st {
struct cfg_st *config; struct cfg_st *config;
struct tun_st *tun; struct tun_st *tun;
tls_cache_db_st *tls_db; tls_cache_db_st *tls_db;
struct listen_list_st* llist;
struct proc_list_st* clist;
} main_server_st; } main_server_st;
void clear_lists(main_server_st *s);
int handle_commands(main_server_st *s, struct proc_list_st* cur); int handle_commands(main_server_st *s, struct proc_list_st* cur);
int call_connect_script(main_server_st *s, struct proc_list_st* cur); int call_connect_script(main_server_st *s, struct proc_list_st* cur);