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

set_env_from_ws: ensure there are no uninitialized variables from snapshot

Browse Source 
Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
This commit is contained in:
Nikos Mavrogiannopoulos
2020-10-29 10:05:00 +01:00
parent 940e489500
commit d83a39da51
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main.c
View File

@@ -113,7 +113,7 @@ ev_signal reload_sig_watcher;
ev_timer latency_watcher; ev_timer latency_watcher;
#endif #endif
static int set_env_from_ws(main_server_st * ws); static bool set_env_from_ws(main_server_st * ws);
static void add_listener(void *pool, struct listen_list_st *list, static void add_listener(void *pool, struct listen_list_st *list,
int fd, int family, int socktype, int protocol, int fd, int family, int socktype, int protocol,
@@ -1192,7 +1192,9 @@ static void listen_watcher_cb (EV_P_ ev_io *w, int revents)
// Clear the HMAC key // Clear the HMAC key
safe_memset((uint8_t*)s->hmac_key, 0, sizeof(s->hmac_key)); safe_memset((uint8_t*)s->hmac_key, 0, sizeof(s->hmac_key));
set_env_from_ws(s); if (!set_env_from_ws(s))
exit(1);
#if defined(PROC_FS_SUPPORTED) #if defined(PROC_FS_SUPPORTED)
{ {
char path[_POSIX_PATH_MAX]; char path[_POSIX_PATH_MAX];
@@ -1693,7 +1695,7 @@ extern unsigned pam_auth_group_list_size;
extern unsigned gssapi_auth_group_list_size; extern unsigned gssapi_auth_group_list_size;
extern unsigned plain_auth_group_list_size; extern unsigned plain_auth_group_list_size;
static int set_env_from_ws(main_server_st *s) static bool set_env_from_ws(main_server_st *s)
{ {
worker_st *ws = s->ws; worker_st *ws = s->ws;
WorkerStartupMsg msg = WORKER_STARTUP_MSG__INIT; WorkerStartupMsg msg = WORKER_STARTUP_MSG__INIT;
@@ -1730,12 +1732,16 @@ static int set_env_from_ws(main_server_st *s)
goto cleanup; goto cleanup;
for (index = 0; index < entry_count; index++) { for (index = 0; index < entry_count; index++) {
int fd; int fd, rr;
const char *file_name; const char *file_name;
if (index == 0) { if (index == 0) {
snapshot_first(config_snapshot, &iter, &fd, &file_name); rr = snapshot_first(config_snapshot, &iter, &fd, &file_name);
} else { } else {
snapshot_next(config_snapshot, &iter, &fd, &file_name); rr = snapshot_next(config_snapshot, &iter, &fd, &file_name);
}
if (rr < 0) {
mslog(s, NULL, LOG_ERR, "snapshot restoration failed (%d)\n", ret);
goto cleanup;
} }
entries[index] = talloc_zero(s, SnapshotEntryMsg); entries[index] = talloc_zero(s, SnapshotEntryMsg);