cmhi
/
f-stack
mirror of https://github.com/F-Stack/f-stack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #302 from chadwill/master 

Nginx: fixbug, stack-buffer-overflow, refer to #286; support "master_process off".
This commit is contained in:
logwang 2018-11-06 14:28:38 +08:00 committed by GitHub
parent 8a8fd4f6bd 3b18e987d1
commit 90dc4341cd
6 changed files with 99 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/nginx-1.11.10/src/core/ngx_connection.c
View File

@ -22,7 +22,7 @@ extern int is_fstack_fd(int sockfd);
static ngx_inline int
ngx_ff_skip_listening_socket(ngx_cycle_t *cycle, const ngx_listening_t *ls, int *type)
{
if (ngx_process <= NGX_PROCESS_MASTER) {
if (ngx_ff_process == NGX_FF_PROCESS_NONE) {
/* process master, kernel network stack*/
if (!ls->belong_to_host) {
@ -32,7 +32,7 @@ ngx_ff_skip_listening_socket(ngx_cycle_t *cycle, const ngx_listening_t *ls, int
return 1;
}
}
} else if (NGX_PROCESS_WORKER == ngx_process) {
} else {
/* process worker, fstack */
if (ls->belong_to_host) {
return 1;
@ -45,11 +45,6 @@ ngx_ff_skip_listening_socket(ngx_cycle_t *cycle, const ngx_listening_t *ls, int
if(type) {
*type |= SOCK_FSTACK;
}
} else {
ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
"unexpected process type: %d, ignored",
ngx_process);
exit(1);
}
return 0;

5
app/nginx-1.11.10/src/event/modules/ngx_ff_host_event_module.c
View File

@ -117,12 +117,13 @@ ngx_ff_epoll_init(ngx_cycle_t *cycle, ngx_msec_t timer)
ngx_free(event_list);
}
event_list = ngx_alloc(sizeof(struct epoll_event), cycle->log);
nevents = 64;
event_list = ngx_alloc(sizeof(struct epoll_event) * nevents, cycle->log);
if (event_list == NULL) {
return NGX_ERROR;
}
nevents = 8;
return NGX_OK;
}

2
app/nginx-1.11.10/src/event/modules/ngx_kqueue_module.c
View File

@ -128,7 +128,7 @@ ngx_kqueue_init(ngx_cycle_t *cycle, ngx_msec_t timer)
#endif
#if (NGX_HAVE_FSTACK)
if(ngx_process != NGX_PROCESS_WORKER) {
if(ngx_ff_process == NGX_FF_PROCESS_NONE) {
return NGX_OK;
}
#endif

4
app/nginx-1.11.10/src/event/ngx_event.c
View File

@ -252,10 +252,10 @@ ngx_process_events_and_timers(ngx_cycle_t *cycle)
#if (NGX_HAVE_FSTACK)
/*
* NGX_PROCESS_WORKERs run on both fstack and kernel,
* NGX_FF_PROCESS_*s run on both fstack and kernel,
* others ( e.g. cache manager/loader ) only run on kernel.
*/
if(ngx_process == NGX_PROCESS_WORKER) {
if(!!ngx_ff_process) {
(void) ngx_process_events(cycle, timer, flags);
/*

89
app/nginx-1.11.10/src/os/unix/ngx_process_cycle.c
View File

@ -29,6 +29,7 @@ static void ngx_cache_loader_process_handler(ngx_event_t *ev);
#if (NGX_HAVE_FSTACK)
extern int ff_mod_init(const char *conf, int proc_id, int proc_type);
ngx_int_t ngx_ff_process;
#endif
ngx_uint_t ngx_process;
@ -72,7 +73,6 @@ static ngx_log_t ngx_exit_log;
static ngx_open_file_t ngx_exit_log_file;
#if (NGX_HAVE_FSTACK)
static ngx_int_t ngx_ff_primary;
static sem_t *ngx_ff_worker_sem;
#endif
@ -312,6 +312,51 @@ ngx_master_process_cycle(ngx_cycle_t *cycle)
}
}
#if (NGX_HAVE_FSTACK)
static int
ngx_single_process_cycle_loop(void *arg)
{
ngx_uint_t i;
ngx_cycle_t *cycle = (ngx_cycle_t *)arg;
//ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "worker cycle");
ngx_process_events_and_timers(cycle);
if (ngx_terminate || ngx_quit) {
for (i = 0; cycle->modules[i]; i++) {
if (cycle->modules[i]->exit_process) {
cycle->modules[i]->exit_process(cycle);
}
}
ngx_master_process_exit(cycle);
}
if (ngx_reconfigure) {
ngx_reconfigure = 0;
ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "reconfiguring");
cycle = ngx_init_cycle(cycle);
if (cycle == NULL) {
cycle = (ngx_cycle_t *) ngx_cycle;
return 0;
}
ngx_cycle = cycle;
}
if (ngx_reopen) {
ngx_reopen = 0;
ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "reopening logs");
ngx_reopen_files(cycle, (ngx_uid_t) -1);
}
return 0;
}
#endif
void
ngx_single_process_cycle(ngx_cycle_t *cycle)
{
@ -322,6 +367,36 @@ ngx_single_process_cycle(ngx_cycle_t *cycle)
exit(2);
}
#if (NGX_HAVE_FSTACK)
ngx_core_conf_t *ccf;
ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
if (ccf->fstack_conf.len == 0) {
ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
"fstack_conf null");
exit(2);
}
ngx_ff_process = NGX_FF_PROCESS_PRIMARY;
if (ff_mod_init((const char *)ccf->fstack_conf.data, 0,
ngx_ff_process == NGX_FF_PROCESS_PRIMARY)) {
ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
"ff_mod_init failed");
exit(2);
}
if (ngx_open_listening_sockets(cycle) != NGX_OK) {
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
"ngx_open_listening_sockets failed");
exit(2);
}
if (!ngx_test_config) {
ngx_configure_listening_sockets(cycle);
}
#endif
for (i = 0; cycle->modules[i]; i++) {
if (cycle->modules[i]->init_process) {
if (cycle->modules[i]->init_process(cycle) == NGX_ERROR) {
@ -331,6 +406,9 @@ ngx_single_process_cycle(ngx_cycle_t *cycle)
}
}
#if (NGX_HAVE_FSTACK)
ff_run(ngx_single_process_cycle_loop, (void *)cycle);
#else
for ( ;; ) {
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "worker cycle");
@ -366,6 +444,7 @@ ngx_single_process_cycle(ngx_cycle_t *cycle)
ngx_reopen_files(cycle, (ngx_uid_t) -1);
}
}
#endif
}
@ -1045,11 +1124,13 @@ ngx_worker_process_init(ngx_cycle_t *cycle, ngx_int_t worker)
}
if (worker == 0) {
ngx_ff_primary = 1;
ngx_ff_process = NGX_FF_PROCESS_PRIMARY;
} else {
ngx_ff_process = NGX_FF_PROCESS_SECONDARY;
}
if (ff_mod_init((const char *)ccf->fstack_conf.data, worker,
ngx_ff_primary)) {
ngx_ff_process == NGX_FF_PROCESS_PRIMARY)) {
ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
"ff_mod_init failed");
exit(2);
@ -1186,7 +1267,7 @@ ngx_worker_process_exit(ngx_cycle_t *cycle)
ngx_log_error(NGX_LOG_NOTICE, ngx_cycle->log, 0, "exit");
#if (NGX_HAVE_FSTACK)
if (ngx_ff_primary) {
if (ngx_ff_process == NGX_FF_PROCESS_PRIMARY) {
// wait for secondary worker processes to exit.
ngx_msleep(500);
}

6
app/nginx-1.11.10/src/os/unix/ngx_process_cycle.h
View File

@ -37,6 +37,12 @@ typedef struct {
void ngx_master_process_cycle(ngx_cycle_t *cycle);
void ngx_single_process_cycle(ngx_cycle_t *cycle);
#if (NGX_HAVE_FSTACK)
#define NGX_FF_PROCESS_NONE 0
#define NGX_FF_PROCESS_PRIMARY 1
#define NGX_FF_PROCESS_SECONDARY 2
extern ngx_int_t ngx_ff_process;
#endif
extern ngx_uint_t ngx_process;
extern ngx_uint_t ngx_worker;