wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-11-06 15:51:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor end of service_start() to prevent deref freed svc

Browse Source 
An SVC_TYPE_RUN may be deleted by svc_clean_bootstrap() as soon as it's
been collected.  We must not try to dereference that pointer afterwards,
e.g. in svc_is_daemon().

Refactor the whole of it to make the code easier to follow.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson committed 2018-09-28 06:50:33 +02:00
1 parent a5491b3ded
commit eee6ffe95c
1 file changed
+16 -8
Download Patch File Download Diff File Expand all files Collapse all files
src/service.c
+16 -8
View File
@@ -346,22 +346,30 @@ static int service_start(svc_t *svc)
svc->pid = pid; svc->pid = pid;
svc->start_time = jiffies(); svc->start_time = jiffies();
#ifdef INETD_ENABLED switch (svc->type) {
if (svc_is_inetd_conn(svc) && svc->inetd.type == SOCK_STREAM) case SVC_TYPE_RUN:
close(svc->stdin_fd);
#endif
if (SVC_TYPE_RUN == svc->type) {
result = WEXITSTATUS(complete(svc->cmd, pid)); result = WEXITSTATUS(complete(svc->cmd, pid));
if (!svc_clean_bootstrap(svc)) { if (!svc_clean_bootstrap(svc)) {
svc->start_time = svc->pid = 0; svc->start_time = svc->pid = 0;
svc->once++; svc->once++;
svc_set_state(svc, SVC_STOPPING_STATE); svc_set_state(svc, SVC_STOPPING_STATE);
} }
} break;
if (svc_is_daemon(svc)) case SVC_TYPE_SERVICE:
pid_file_create(svc); pid_file_create(svc);
break;
#ifdef INETD_ENABLED
case SVC_TYPE_INETD_CONN:
if (svc->inetd.type == SOCK_STREAM)
close(svc->stdin_fd);
break;
#endif
default:
break;
}
sigprocmask(SIG_SETMASK, &omask, NULL); sigprocmask(SIG_SETMASK, &omask, NULL);
if (do_progress) if (do_progress)