108 lines
4.1 KiB
Diff
108 lines
4.1 KiB
Diff
From d9a06fe94439d9f103aeffe597441c0a2c0a4eb3 Mon Sep 17 00:00:00 2001
|
|
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
|
|
Date: Sat, 9 Mar 2024 16:26:42 +0900
|
|
Subject: [PATCH] Limit CONTINUATION frames following an incoming HEADER frame
|
|
|
|
Signed-off-by: rpm-build <rpm-build>
|
|
---
|
|
deps/nghttp2/lib/includes/nghttp2/nghttp2.h | 7 ++++++-
|
|
deps/nghttp2/lib/nghttp2_helper.c | 2 ++
|
|
deps/nghttp2/lib/nghttp2_session.c | 7 +++++++
|
|
deps/nghttp2/lib/nghttp2_session.h | 10 ++++++++++
|
|
4 files changed, 25 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/deps/nghttp2/lib/includes/nghttp2/nghttp2.h b/deps/nghttp2/lib/includes/nghttp2/nghttp2.h
|
|
index 8891760..a9629c7 100644
|
|
--- a/deps/nghttp2/lib/includes/nghttp2/nghttp2.h
|
|
+++ b/deps/nghttp2/lib/includes/nghttp2/nghttp2.h
|
|
@@ -466,7 +466,12 @@ typedef enum {
|
|
* exhaustion on server side to send these frames forever and does
|
|
* not read network.
|
|
*/
|
|
- NGHTTP2_ERR_FLOODED = -904
|
|
+ NGHTTP2_ERR_FLOODED = -904,
|
|
+ /**
|
|
+ * When a local endpoint receives too many CONTINUATION frames
|
|
+ * following a HEADER frame.
|
|
+ */
|
|
+ NGHTTP2_ERR_TOO_MANY_CONTINUATIONS = -905,
|
|
} nghttp2_error;
|
|
|
|
/**
|
|
diff --git a/deps/nghttp2/lib/nghttp2_helper.c b/deps/nghttp2/lib/nghttp2_helper.c
|
|
index 93dd475..b3563d9 100644
|
|
--- a/deps/nghttp2/lib/nghttp2_helper.c
|
|
+++ b/deps/nghttp2/lib/nghttp2_helper.c
|
|
@@ -336,6 +336,8 @@ const char *nghttp2_strerror(int error_code) {
|
|
"closed";
|
|
case NGHTTP2_ERR_TOO_MANY_SETTINGS:
|
|
return "SETTINGS frame contained more than the maximum allowed entries";
|
|
+ case NGHTTP2_ERR_TOO_MANY_CONTINUATIONS:
|
|
+ return "Too many CONTINUATION frames following a HEADER frame";
|
|
default:
|
|
return "Unknown error code";
|
|
}
|
|
diff --git a/deps/nghttp2/lib/nghttp2_session.c b/deps/nghttp2/lib/nghttp2_session.c
|
|
index 226cdd5..e343365 100644
|
|
--- a/deps/nghttp2/lib/nghttp2_session.c
|
|
+++ b/deps/nghttp2/lib/nghttp2_session.c
|
|
@@ -497,6 +497,7 @@ static int session_new(nghttp2_session **session_ptr,
|
|
(*session_ptr)->max_send_header_block_length = NGHTTP2_MAX_HEADERSLEN;
|
|
(*session_ptr)->max_outbound_ack = NGHTTP2_DEFAULT_MAX_OBQ_FLOOD_ITEM;
|
|
(*session_ptr)->max_settings = NGHTTP2_DEFAULT_MAX_SETTINGS;
|
|
+ (*session_ptr)->max_continuations = NGHTTP2_DEFAULT_MAX_CONTINUATIONS;
|
|
|
|
if (option) {
|
|
if ((option->opt_set_mask & NGHTTP2_OPT_NO_AUTO_WINDOW_UPDATE) &&
|
|
@@ -6812,6 +6813,8 @@ nghttp2_ssize nghttp2_session_mem_recv2(nghttp2_session *session,
|
|
}
|
|
}
|
|
session_inbound_frame_reset(session);
|
|
+
|
|
+ session->num_continuations = 0;
|
|
}
|
|
break;
|
|
}
|
|
@@ -6933,6 +6936,10 @@ nghttp2_ssize nghttp2_session_mem_recv2(nghttp2_session *session,
|
|
}
|
|
#endif /* DEBUGBUILD */
|
|
|
|
+ if (++session->num_continuations > session->max_continuations) {
|
|
+ return NGHTTP2_ERR_TOO_MANY_CONTINUATIONS;
|
|
+ }
|
|
+
|
|
readlen = inbound_frame_buf_read(iframe, in, last);
|
|
in += readlen;
|
|
|
|
diff --git a/deps/nghttp2/lib/nghttp2_session.h b/deps/nghttp2/lib/nghttp2_session.h
|
|
index b119329..ef8f7b2 100644
|
|
--- a/deps/nghttp2/lib/nghttp2_session.h
|
|
+++ b/deps/nghttp2/lib/nghttp2_session.h
|
|
@@ -110,6 +110,10 @@ typedef struct {
|
|
#define NGHTTP2_DEFAULT_STREAM_RESET_BURST 1000
|
|
#define NGHTTP2_DEFAULT_STREAM_RESET_RATE 33
|
|
|
|
+/* The default max number of CONTINUATION frames following an incoming
|
|
+ HEADER frame. */
|
|
+#define NGHTTP2_DEFAULT_MAX_CONTINUATIONS 8
|
|
+
|
|
/* Internal state when receiving incoming frame */
|
|
typedef enum {
|
|
/* Receiving frame header */
|
|
@@ -290,6 +294,12 @@ struct nghttp2_session {
|
|
size_t max_send_header_block_length;
|
|
/* The maximum number of settings accepted per SETTINGS frame. */
|
|
size_t max_settings;
|
|
+ /* The maximum number of CONTINUATION frames following an incoming
|
|
+ HEADER frame. */
|
|
+ size_t max_continuations;
|
|
+ /* The number of CONTINUATION frames following an incoming HEADER
|
|
+ frame. This variable is reset when END_HEADERS flag is seen. */
|
|
+ size_t num_continuations;
|
|
/* Next Stream ID. Made unsigned int to detect >= (1 << 31). */
|
|
uint32_t next_stream_id;
|
|
/* The last stream ID this session initiated. For client session,
|
|
--
|
|
2.44.0
|
|
|