Skip to content

Add integer overflow checks in Program::LoadSegment #19268

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

Merged
rascani merged 2 commits into from
May 12, 2026
Merged

Add integer overflow checks in Program::LoadSegment #19268

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
066e3f8
Add integer overflow checks in Program::LoadSegment
rascani May 1, 2026
2ce7707
Merge branch 'main' into export-D103467784
rascani May 11, 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
47 changes: 41 additions & 6 deletions runtime/executor/program.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <cstddef>
#include <cstdint>

#include <c10/util/safe_numerics.h>
#include <executorch/runtime/core/event_tracer_hooks.h>
#include <executorch/runtime/executor/memory_manager.h>
#include <executorch/runtime/executor/method.h>
Expand Down Expand Up @@ -560,8 +561,18 @@ Result<FreeableBuffer> Program::LoadSegment(
// Could fail if offset and size are out of bound for the data, or if this
// is reading from a file and fails, or for many other reasons depending on
// the implementation of the loader.
uint64_t seg_offset = segment->offset();
uint64_t absolute_offset = 0;
ET_CHECK_OR_RETURN_ERROR(
!c10::add_overflows<uint64_t>(
segment_base_offset_, seg_offset, &absolute_offset) &&
absolute_offset <= SIZE_MAX,
InvalidProgram,
"segment_base_offset %zu + segment offset %" PRIu64 " overflows",
segment_base_offset_,
seg_offset);
return loader_->load(
segment_base_offset_ + segment->offset(), segment->size(), segment_info);
static_cast<size_t>(absolute_offset), segment->size(), segment_info);
}

Error Program::load_mutable_subsegment_into(
Expand Down Expand Up @@ -628,8 +639,15 @@ Error Program::load_mutable_subsegment_into(
auto segment =
internal_program_->segments()->Get(segment_offsets->segment_index());

// Check size
if (offset + size > segment->size()) {
// Check size (with overflow protection)
size_t end_offset = 0;
ET_CHECK_OR_RETURN_ERROR(
!c10::add_overflows(offset, size, &end_offset),
InvalidProgram,
"offset %zu + size %zu overflows",
offset,
size);
if (end_offset > segment->size()) {
ET_LOG(
Error,
"offset %zu + size %zu out of range > %" PRIu64,
Expand All @@ -644,9 +662,26 @@ Error Program::load_mutable_subsegment_into(
segment_offsets->segment_index(),
nullptr);

// Load the data
return loader_->load_into(
segment_base_offset_ + segment->offset() + offset, size, info, buffer);
// Load the data (with overflow protection on the addition chain)
uint64_t seg_offset = segment->offset();
uint64_t base_plus_seg_64 = 0;
ET_CHECK_OR_RETURN_ERROR(
!c10::add_overflows<uint64_t>(
segment_base_offset_, seg_offset, &base_plus_seg_64) &&
base_plus_seg_64 <= SIZE_MAX,
InvalidProgram,
"segment_base_offset %zu + segment offset %" PRIu64 " overflows",
segment_base_offset_,
seg_offset);
size_t base_plus_seg = static_cast<size_t>(base_plus_seg_64);
size_t total_offset = 0;
ET_CHECK_OR_RETURN_ERROR(
!c10::add_overflows(base_plus_seg, offset, &total_offset),
InvalidProgram,
"segment base+offset %zu + subsegment offset %zu overflows",
base_plus_seg,
offset);
return loader_->load_into(total_offset, size, info, buffer);
}

} // namespace ET_RUNTIME_NAMESPACE
Expand Down
Loading