fix(runtime): cap CONTINUATION frame count per header block (MOLO-H2-003)

kH2HeaderListMax only bounded accumulated header bytes across HEADERS plus
CONTINUATION frames, so an attacker could flood zero-length CONTINUATION
frames on an open header block (CVE-2024-27316 class) forever without
tripping the byte cap, each still costing a 9-byte frame parse. Add an
independent kH2MaxContinuationFramesPerHeaderBlock cap in caps.h and
enforce it in H2Connection::OnContinuation, closing the connection via the
same Fatal(kCompressionError) GOAWAY path already used for the byte cap.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
2026-10-25 20:06:37 +01:00
co-authored by Claude Sonnet 5
parent 16a0bb0de4
commit 11ae3ce4a5
3 changed files with 15 additions and 0 deletions
+4
View File
@@ -57,6 +57,10 @@ inline constexpr std::size_t kH2HeaderTableDefault = 4096;
inline constexpr std::size_t kH2HeaderTableCeiling = 16384;
inline constexpr std::size_t kH2HeaderListMax = 65536;
inline constexpr std::size_t kH2MaxFrameHeaderListCap = 100;
// Independent of kH2HeaderListMax (bytes): caps CONTINUATION frame *count*
// for one open header block, so a flood of zero-length CONTINUATION frames
// (near-zero byte growth) cannot evade the byte cap. CVE-2024-27316 class.
inline constexpr std::size_t kH2MaxContinuationFramesPerHeaderBlock = 64;
// 6.5 Compression.
inline constexpr std::size_t kCompressThreshold = 1024;
+8
View File
@@ -406,6 +406,7 @@ bool H2Connection::OnHeaders(const Frame& fr, const char* payload) {
cont_stream_ = fr.stream_id;
cont_buf_.assign(payload + off, len);
cont_end_stream_ = end_stream;
cont_frame_count_ = 0;
return true;
}
return FinishHeaders(fr.stream_id, std::string(payload + off, len),
@@ -461,6 +462,13 @@ bool H2Connection::OnContinuation(const Frame& fr, const char* payload) {
Fatal(kCompressionError);
return false;
}
// Independent of the byte cap above: bounds the number of CONTINUATION
// frames for one header block, so a flood of zero-length frames (which
// never trips the byte cap) still gets cut off. CVE-2024-27316 class.
if (++cont_frame_count_ > caps::kH2MaxContinuationFramesPerHeaderBlock) {
Fatal(kCompressionError);
return false;
}
cont_buf_.append(payload, fr.length);
if (!(fr.flags & kFlagEndHeaders)) return true;
cont_expected_ = false;
+3
View File
@@ -145,6 +145,9 @@ class H2Connection : public std::enable_shared_from_this<H2Connection> {
uint32_t cont_stream_ = 0;
std::string cont_buf_;
bool cont_end_stream_ = false;
// Count of CONTINUATION frames seen for the currently open header block;
// independent of cont_buf_'s byte size. See kH2MaxContinuationFramesPerHeaderBlock.
std::size_t cont_frame_count_ = 0;
std::coroutine_handle<> window_waiter_ = nullptr;
std::coroutine_handle<> writer_done_waiter_ = nullptr;
};