technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed error handling of prefork callback.

Browse Source 
Previously, an error during the prefork phase triggered assert:

 src/nxt_port.c:27 assertion failed: port->pair[0] == -1

and resulted in exiting of the main process.

This could be easily reproduced by pushing a configuration with "rootfs",
when daemon is running without required permissions.
This commit is contained in:
Tiago Natel de Moura
2020-08-13 12:25:52 +01:00
parent a58f224e26
commit b9ed3384cb
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/nxt_main_process.c
View File

@@ -605,25 +605,22 @@ nxt_main_start_process(nxt_task_t *task, nxt_process_t *process)
nxt_process_port_add(task, process, port); nxt_process_port_add(task, process, port);
nxt_process_use(task, process, -1);
ret = NXT_ERROR;
tmp_mp = NULL;
ret = nxt_port_socket_init(task, port, 0); ret = nxt_port_socket_init(task, port, 0);
if (nxt_slow_path(ret != NXT_OK)) { if (nxt_slow_path(ret != NXT_OK)) {
goto fail; goto free_port;
} }
tmp_mp = nxt_mp_create(1024, 128, 256, 32); tmp_mp = nxt_mp_create(1024, 128, 256, 32);
if (tmp_mp == NULL) { if (nxt_slow_path(tmp_mp == NULL)) {
goto fail; ret = NXT_ERROR;
goto close_port;
} }
if (init->prefork) { if (init->prefork) {
ret = init->prefork(task, process, tmp_mp); ret = init->prefork(task, process, tmp_mp);
if (nxt_slow_path(ret != NXT_OK)) { if (nxt_slow_path(ret != NXT_OK)) {
goto fail; goto free_mempool;
} }
} }
@@ -632,18 +629,22 @@ nxt_main_start_process(nxt_task_t *task, nxt_process_t *process)
switch (pid) { switch (pid) {
case -1: case -1:
nxt_port_close(task, port); ret = NXT_ERROR;
break; break;
case 0: case 0:
/* The child process: return to the event engine work queue loop. */ /* The child process: return to the event engine work queue loop. */
nxt_process_use(task, process, -1);
ret = NXT_AGAIN; ret = NXT_AGAIN;
break; break;
default: default:
/* The main process created a new process. */ /* The main process created a new process. */
nxt_process_use(task, process, -1);
nxt_port_read_close(port); nxt_port_read_close(port);
nxt_port_write_enable(task, port); nxt_port_write_enable(task, port);
@@ -651,14 +652,20 @@ nxt_main_start_process(nxt_task_t *task, nxt_process_t *process)
break; break;
} }
fail: free_mempool:
nxt_mp_destroy(tmp_mp);
close_port:
if (nxt_slow_path(ret == NXT_ERROR)) {
nxt_port_close(task, port);
}
free_port:
nxt_port_use(task, port, -1); nxt_port_use(task, port, -1);
if (nxt_fast_path(tmp_mp != NULL)) {
nxt_mp_destroy(tmp_mp);
}
return ret; return ret;
} }