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

Stream pass: limited the number of passes per connection.

Browse Source 
Previously a cycle in pass configuration resulted in stack overflow.
This commit is contained in:
Roman Arutyunyan 2024-04-11 11:37:30 +04:00
parent 92f9968571
commit bf3e6538b9
1 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/stream/ngx_stream_pass_module.c
View File

@ -10,6 +10,9 @@
#include <ngx_stream.h> #include <ngx_stream.h>
#define NGX_STREAM_PASS_MAX_PASSES 10
typedef struct { typedef struct {
ngx_addr_t *addr; ngx_addr_t *addr;
ngx_stream_complex_value_t *addr_value; ngx_stream_complex_value_t *addr_value;
@ -17,6 +20,8 @@ typedef struct {
static void ngx_stream_pass_handler(ngx_stream_session_t *s); static void ngx_stream_pass_handler(ngx_stream_session_t *s);
static ngx_int_t ngx_stream_pass_check_cycle(ngx_connection_t *c);
static void ngx_stream_pass_cleanup(void *data);
static ngx_int_t ngx_stream_pass_match(ngx_listening_t *ls, ngx_addr_t *addr); static ngx_int_t ngx_stream_pass_match(ngx_listening_t *ls, ngx_addr_t *addr);
static void *ngx_stream_pass_create_srv_conf(ngx_conf_t *cf); static void *ngx_stream_pass_create_srv_conf(ngx_conf_t *cf);
static char *ngx_stream_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); static char *ngx_stream_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
@ -125,6 +130,10 @@ ngx_stream_pass_handler(ngx_stream_session_t *s)
ngx_log_debug1(NGX_LOG_DEBUG_STREAM, c->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_STREAM, c->log, 0,
"stream pass addr: \"%V\"", &addr->name); "stream pass addr: \"%V\"", &addr->name);
if (ngx_stream_pass_check_cycle(c) != NGX_OK) {
goto failed;
}
ls = ngx_cycle->listening.elts; ls = ngx_cycle->listening.elts;
for (i = 0; i < ngx_cycle->listening.nelts; i++) { for (i = 0; i < ngx_cycle->listening.nelts; i++) {
@ -163,6 +172,48 @@ failed:
} }
static ngx_int_t
ngx_stream_pass_check_cycle(ngx_connection_t *c)
{
ngx_uint_t *num;
ngx_pool_cleanup_t *cln;
for (cln = c->pool->cleanup; cln; cln = cln->next) {
if (cln->handler != ngx_stream_pass_cleanup) {
continue;
}
num = cln->data;
if (++(*num) > NGX_STREAM_PASS_MAX_PASSES) {
ngx_log_error(NGX_LOG_ERR, c->log, 0, "stream pass cycle");
return NGX_ERROR;
}
return NGX_OK;
}
cln = ngx_pool_cleanup_add(c->pool, sizeof(ngx_uint_t));
if (cln == NULL) {
return NGX_ERROR;
}
cln->handler = ngx_stream_pass_cleanup;
num = cln->data;
*num = 1;
return NGX_OK;
}
static void
ngx_stream_pass_cleanup(void *data)
{
return;
}
static ngx_int_t static ngx_int_t
ngx_stream_pass_match(ngx_listening_t *ls, ngx_addr_t *addr) ngx_stream_pass_match(ngx_listening_t *ls, ngx_addr_t *addr)
{ {