# HG changeset patch # User Maxim Dounin # Date 1541510999 -10800 # Node ID 6afba58cd5a33aefd4c1ad2b2c8299b8aa462c74 # Parent 9200b41db765fbd6709765ba2d218e78ad8e9860 gRPC: limited allocations due to ping and settings frames. diff --git a/src/http/modules/ngx_http_grpc_module.c b/src/http/modules/ngx_http_grpc_module.c --- a/src/http/modules/ngx_http_grpc_module.c +++ b/src/http/modules/ngx_http_grpc_module.c @@ -78,6 +78,9 @@ typedef struct { ngx_uint_t id; + ngx_uint_t pings; + ngx_uint_t settings; + ssize_t send_window; size_t recv_window; @@ -3531,6 +3534,12 @@ ngx_http_grpc_parse_settings(ngx_http_re ctx->rest); return NGX_ERROR; } + + if (ctx->free == NULL && ctx->settings++ > 1000) { + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "upstream sent too many settings frames"); + return NGX_ERROR; + } } for (p = b->pos; p < last; p++) { @@ -3683,6 +3692,12 @@ ngx_http_grpc_parse_ping(ngx_http_reques "upstream sent ping frame with ack flag"); return NGX_ERROR; } + + if (ctx->free == NULL && ctx->pings++ > 1000) { + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "upstream sent too many ping frames"); + return NGX_ERROR; + } } for (p = b->pos; p < last; p++) {