Skip to content

Clamp HTTP3 frame type buf size to reader bytes #13242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JosiahWI wants to merge 4 commits into
base: master
Choose a base branch
from
+10 −6
Open

Clamp HTTP3 frame type buf size to reader bytes #13242

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f09234
Clamp HTTP3 frame type buf size to reader bytes
JosiahWI Jun 5, 2026
ac8cc31
Fix incorrect identifier name
JosiahWI Jun 5, 2026
7062013
Fix incorrect identifier
JosiahWI Jun 5, 2026
af0616a
Fix incorrect identifier name
JosiahWI Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/proxy/http3/Http3Frame.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
#include "proxy/http3/Http3Frame.h"
#include "proxy/http3/Http3Config.h"

#include <algorithm>

ClassAllocator<Http3Frame, false> http3FrameAllocator("http3FrameAllocator");
ClassAllocator<Http3DataFrame, false> http3DataFrameAllocator("http3DataFrameAllocator");
ClassAllocator<Http3HeadersFrame, false> http3HeadersFrameAllocator("http3HeadersFrameAllocator");
Expand Down Expand Up @@ -505,9 +507,10 @@ Http3FrameFactory::create(IOBufferReader &reader)
ts::Http3Config::scoped_config params;
Http3Frame *frame = nullptr;

uint8_t type_buf[FRAME_TYPE_MAX_BYTES]{};
reader.memcpy(type_buf, sizeof(type_buf));
Http3FrameType type = Http3Frame::type(type_buf, sizeof(type_buf));
uint8_t type_buf[FRAME_TYPE_MAX_BYTES]{};
std::size_t const type_avail{std::min<std::size_t>(reader.read_avail(), sizeof(type_buf))};
reader.memcpy(type_buf, type_avail);
Http3FrameType type = Http3Frame::type(type_buf, type_avail);
Comment thread
JosiahWI marked this conversation as resolved.

switch (type) {
case Http3FrameType::HEADERS:
Expand All @@ -534,9 +537,10 @@ Http3FrameFactory::create(IOBufferReader &reader)
std::shared_ptr<Http3Frame>
Http3FrameFactory::fast_create(IOBufferReader &reader)
{
uint8_t type_buf[FRAME_TYPE_MAX_BYTES]{};
reader.memcpy(type_buf, sizeof(type_buf));
Http3FrameType type = Http3Frame::type(type_buf, sizeof(type_buf));
uint8_t type_buf[FRAME_TYPE_MAX_BYTES]{};
std::size_t const type_avail{std::min<std::size_t>(reader.read_avail(), sizeof(type_buf))};
reader.memcpy(type_buf, type_avail);
Http3FrameType type = Http3Frame::type(type_buf, type_avail);
Comment thread
JosiahWI marked this conversation as resolved.
Comment thread
JosiahWI marked this conversation as resolved.
if (type == Http3FrameType::UNKNOWN) {
if (!this->_unknown_frame) {
this->_unknown_frame = Http3FrameFactory::create(reader);
Expand Down