mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-12 10:19:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed segfault with incorrect location nesting.

Browse Source 
A configuration with a named location inside a zero-length prefix
or regex location used to trigger a segmentation fault, as
ngx_http_core_location() failed to properly detect if a nested location
was created.  Example configuration to reproduce the problem:

    location "" {
        location @foo {}
    }

Fix is to not rely on a parent location name length, but rather check
command type we are currently parsing.

Identical fix is also applied to ngx_http_rewrite_if(), which used to
incorrectly assume the "if" directive is on server{} level in such
locations.

Reported by Markus Linnala.
Found with afl-fuzz.
This commit is contained in:
Maxim Dounin 2015-09-11 17:04:04 +03:00
parent ce05841eef
commit 7930a6c442
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/http/modules/ngx_http_rewrite_module.c
View File

@ -612,7 +612,7 @@ ngx_http_rewrite_if(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
save = *cf; save = *cf;
cf->ctx = ctx; cf->ctx = ctx;
if (pclcf->name.len == 0) { if (cf->cmd_type == NGX_HTTP_SRV_CONF) {
if_code->loc_conf = NULL; if_code->loc_conf = NULL;
cf->cmd_type = NGX_HTTP_SIF_CONF; cf->cmd_type = NGX_HTTP_SIF_CONF;

2
src/http/ngx_http_core_module.c
View File

@ -3196,7 +3196,7 @@ ngx_http_core_location(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
pclcf = pctx->loc_conf[ngx_http_core_module.ctx_index]; pclcf = pctx->loc_conf[ngx_http_core_module.ctx_index];
if (pclcf->name.len) { if (cf->cmd_type == NGX_HTTP_LOC_CONF) {
/* nested location */ /* nested location */