Skip to content

Commit 86f1ced

Browse files
authored
add upstream patch for CVE-2023-44487 (#10494)
* add upstream patch * add source * remove auto-added depend
1 parent a0eac18 commit 86f1ced

File tree

1 file changed

+57
-0
lines changed

1 file changed

+57
-0
lines changed
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
#commit 6ceef192e7af1c507826ac38a2d43f08bf265fb9
2+
#repository: https://github.com/nginx/nginx
3+
#Author: Maxim Dounin <[email protected]>
4+
#Date: Tue Oct 10 15:13:39 2023 +0300
5+
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
6+
index 7c05ff1e7..410a8be24 100644
7+
--- a/src/http/v2/ngx_http_v2.c
8+
+++ b/src/http/v2/ngx_http_v2.c
9+
@@ -347,6 +347,7 @@ ngx_http_v2_read_handler(ngx_event_t *rev)
10+
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http2 read handler");
11+
12+
h2c->blocked = 1;
13+
+ h2c->new_streams = 0;
14+
15+
if (c->close) {
16+
c->close = 0;
17+
@@ -1284,6 +1285,14 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
18+
goto rst_stream;
19+
}
20+
21+
+ if (h2c->new_streams++ >= 2 * h2scf->concurrent_streams) {
22+
+ ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
23+
+ "client sent too many streams at once");
24+
+
25+
+ status = NGX_HTTP_V2_REFUSED_STREAM;
26+
+ goto rst_stream;
27+
+ }
28+
+
29+
if (!h2c->settings_ack
30+
&& !(h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG)
31+
&& h2scf->preread_size < NGX_HTTP_V2_DEFAULT_WINDOW)
32+
@@ -1349,6 +1358,12 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
33+
34+
rst_stream:
35+
36+
+ if (h2c->refused_streams++ > ngx_max(h2scf->concurrent_streams, 100)) {
37+
+ ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
38+
+ "client sent too many refused streams");
39+
+ return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_NO_ERROR);
40+
+ }
41+
+
42+
if (ngx_http_v2_send_rst_stream(h2c, h2c->state.sid, status) != NGX_OK) {
43+
return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
44+
}
45+
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
46+
index cb9014ccf..6751b3026 100644
47+
--- a/src/http/v2/ngx_http_v2.h
48+
+++ b/src/http/v2/ngx_http_v2.h
49+
@@ -131,6 +131,8 @@ struct ngx_http_v2_connection_s {
50+
ngx_uint_t processing;
51+
ngx_uint_t frames;
52+
ngx_uint_t idle;
53+
+ ngx_uint_t new_streams;
54+
+ ngx_uint_t refused_streams;
55+
ngx_uint_t priority_limit;
56+
57+
size_t send_window;

0 commit comments

Comments
 (0)